[v1.28.x-0.49bx] Fix eachdist.py patch release to not add extra space

and make update-version-patch.sh executable
aabmass · Nov 15, 2024 · f48be9b · f48be9b
1 parent 9676505
commit f48be9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/scripts/update-version-patch.sh b/.github/scripts/update-version-patch.sh
diff --git a/scripts/eachdist.py b/scripts/eachdist.py
@@ -616,8 +616,9 @@ 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})"
-        replace = r"\1\2 " + version
+        search = rf"({basename(pkg)}[^,]*?)(\s?({operators_pattern})\s?)(.*{prev_version})"
+        replace = r"\g<1>\g<2>" + version
+        print(f"{search=}\t{replace=}\t{pkg=}")
         update_files(
             targets,
             "pyproject.toml",