From c3e3dcb3dede6c48948e959167ebece0f19cedab Mon Sep 17 00:00:00 2001 From: Tasdiqul Date: Wed, 20 May 2026 17:50:50 -0500 Subject: [PATCH 1/3] fix: tighten eachdist dependency version matching Assisted-by: OpenAI Codex --- scripts/eachdist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/eachdist.py b/scripts/eachdist.py index c5f5e9880c7..a0775405f96 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( From 1b430ec1a3b2105e012c417fae131c9df933d43f Mon Sep 17 00:00:00 2001 From: Tasdiqul Date: Wed, 20 May 2026 17:51:58 -0500 Subject: [PATCH 2/3] chore: add changelog for eachdist dependency matching Assisted-by: OpenAI Codex --- .changelog/5237.fixed | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/5237.fixed diff --git a/.changelog/5237.fixed b/.changelog/5237.fixed new file mode 100644 index 00000000000..66c82306d9d --- /dev/null +++ b/.changelog/5237.fixed @@ -0,0 +1 @@ +Prevent release tooling from matching dependency name prefixes. From f2901df5d41d84e0b882a3f48deb723489271953 Mon Sep 17 00:00:00 2001 From: Tasdiqul Date: Thu, 21 May 2026 09:08:41 -0500 Subject: [PATCH 3/3] fix: simplify eachdist dependency match Assisted-by: OpenAI Codex --- scripts/eachdist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/eachdist.py b/scripts/eachdist.py index a0775405f96..39fd7b4894e 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)}\s[^,]*)({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[^,]*?)(\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(