From 13f57585b1138b21d8786e88c7f303f248652603 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Mon, 18 Nov 2024 12:03:53 -0500 Subject: [PATCH] Fix eachdist.py patch release to respect "all" and "excluded" (#3016) --- scripts/eachdist.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/eachdist.py b/scripts/eachdist.py index a7bf7d01f..ca490546e 100755 --- a/scripts/eachdist.py +++ b/scripts/eachdist.py @@ -667,6 +667,9 @@ def update_dependencies(targets, version, packages): def update_patch_dependencies(targets, version, prev_version, packages): print("updating patch dependencies") + if "all" in packages: + packages.extend(targets) + # PEP 508 allowed specifier operators operators = ["==", "!=", "<=", ">=", "<", ">", "===", "~=", "="] operators_pattern = "|".join(re.escape(op) for op in operators) @@ -715,10 +718,12 @@ def release_args(args): versions = args.versions updated_versions = [] + # remove excluded packages excluded = cfg["exclude_release"]["packages"].split() targets = [ target for target in targets if basename(target) not in excluded ] + for group in versions.split(","): mcfg = cfg[group] version = mcfg["version"] @@ -742,10 +747,18 @@ def patch_release_args(args): targets = list(find_targets_unordered(rootpath)) cfg = ConfigParser() cfg.read(str(find_projectroot() / "eachdist.ini")) + + # remove excluded packages + excluded = cfg["exclude_release"]["packages"].split() + targets = [ + target for target in targets if basename(target) not in excluded + ] + # stable mcfg = cfg["stable"] packages = mcfg["packages"].split() print(f"update stable packages to {args.stable_version}") + update_patch_dependencies( targets, args.stable_version, args.stable_version_prev, packages )