From 0d6fd62916fdbaef435115a11fa86c65da1e475a Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Fri, 15 Nov 2024 20:01:43 +0000 Subject: [PATCH] [v1.28.x-0.49bx] Fix eachdist.py patch release to not add extra space and make update-version-patch.sh executable --- .github/scripts/update-version-patch.sh | 0 scripts/eachdist.py | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 .github/scripts/update-version-patch.sh diff --git a/.github/scripts/update-version-patch.sh b/.github/scripts/update-version-patch.sh old mode 100644 new mode 100755 diff --git a/scripts/eachdist.py b/scripts/eachdist.py index 68b7206ffef..b01d0733657 100755 --- 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",