Skip to content

Commit 13f5758

Browse files
authored
Fix eachdist.py patch release to respect "all" and "excluded" (#3016)
1 parent 29d61aa commit 13f5758

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

scripts/eachdist.py

+13
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,9 @@ def update_dependencies(targets, version, packages):
667667

668668
def update_patch_dependencies(targets, version, prev_version, packages):
669669
print("updating patch dependencies")
670+
if "all" in packages:
671+
packages.extend(targets)
672+
670673
# PEP 508 allowed specifier operators
671674
operators = ["==", "!=", "<=", ">=", "<", ">", "===", "~=", "="]
672675
operators_pattern = "|".join(re.escape(op) for op in operators)
@@ -715,10 +718,12 @@ def release_args(args):
715718
versions = args.versions
716719
updated_versions = []
717720

721+
# remove excluded packages
718722
excluded = cfg["exclude_release"]["packages"].split()
719723
targets = [
720724
target for target in targets if basename(target) not in excluded
721725
]
726+
722727
for group in versions.split(","):
723728
mcfg = cfg[group]
724729
version = mcfg["version"]
@@ -742,10 +747,18 @@ def patch_release_args(args):
742747
targets = list(find_targets_unordered(rootpath))
743748
cfg = ConfigParser()
744749
cfg.read(str(find_projectroot() / "eachdist.ini"))
750+
751+
# remove excluded packages
752+
excluded = cfg["exclude_release"]["packages"].split()
753+
targets = [
754+
target for target in targets if basename(target) not in excluded
755+
]
756+
745757
# stable
746758
mcfg = cfg["stable"]
747759
packages = mcfg["packages"].split()
748760
print(f"update stable packages to {args.stable_version}")
761+
749762
update_patch_dependencies(
750763
targets, args.stable_version, args.stable_version_prev, packages
751764
)

0 commit comments

Comments
 (0)