The regex in update_dependencies is not strict enough and opentelemetry-proto-json get also the opentelemetry-proto substitution.
This seems to do the trick:
diff --git a/scripts/eachdist.py b/scripts/eachdist.py
index c5f5e9880..a0775405f 100755
--- a/scripts/eachdist.py
+++ b/scripts/eachdist.py
@@ -601,7 +601,7 @@ def update_dependencies(targets, version, packages):
operators_pattern = "|".join(re.escape(op) for op in operators)
for pkg in packages:
- search = rf"({basename(pkg)}[^,]*)({operators_pattern})(.*\.dev)"
+ search = rf"({basename(pkg)}\s[^,]*)({operators_pattern})(.*\.dev)"
replace = r"\1\2 " + version
update_files(
targets,
@@ -618,7 +618,7 @@ def update_patch_dependencies(targets, version, prev_version, packages):
operators_pattern = "|".join(re.escape(op) for op in operators)
for pkg in packages:
- search = rf"({basename(pkg)}[^,]*?)(\s?({operators_pattern})\s?)(.*{prev_version})"
+ search = rf"({basename(pkg)}\s[^,]*?)(\s?({operators_pattern})\s?)(.*{prev_version})"
replace = r"\g<1>\g<2>" + version
print(f"{search=}\t{replace=}\t{pkg=}")
update_files(
The strange thing is that the bump on the release branch failed but the bump on main was correct.
To test this locally need to bump versions in eachdist.ini and then run ./scripts/eachdist.py update_versions --versions stable,prerelease
The regex in
update_dependenciesis not strict enough andopentelemetry-proto-jsonget also theopentelemetry-protosubstitution.This seems to do the trick:
The strange thing is that the bump on the release branch failed but the bump on main was correct.
To test this locally need to bump versions in
eachdist.iniand then run./scripts/eachdist.py update_versions --versions stable,prerelease