Skip to content

Commit 70bcd42

Browse files
committed
Merge branch 'major/3.0' into ivana/major/drop-3.6
2 parents 528ba61 + 49a2a7d commit 70bcd42

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

scripts/generate-test-files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ cd "$(dirname "$0")"
88

99
export UV_PROJECT_ENVIRONMENT=toxgen.venv
1010

11-
uv run --python 3.14t --group toxgen --with-editable .. python populate_tox/populate_tox.py
11+
uv run --python 3.14t --group toxgen --with-editable .. python populate_tox/populate_tox.py "$@"
1212
uv run --python 3.14t --group toxgen --with-editable .. python split_tox_gh_actions/split_tox_gh_actions.py

scripts/populate_tox/populate_tox.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,13 +1208,13 @@ def get_releases_to_test(integration, package) -> list[Version] | None:
12081208
def parse_args() -> argparse.Namespace:
12091209
parser = argparse.ArgumentParser()
12101210
parser.add_argument(
1211-
"--skip-version-update",
1211+
"--skip",
12121212
nargs="*",
12131213
default=[],
12141214
help="Integrations to skip version updates for.",
12151215
)
12161216
parser.add_argument(
1217-
"--only-update",
1217+
"--only",
12181218
nargs="*",
12191219
default=[],
12201220
help="Only update versions for these integrations (all others will be skipped).",
@@ -1281,12 +1281,17 @@ def main() -> dict[str, list]:
12811281
}
12821282

12831283
args = parse_args()
1284-
if args.skip_version_update and args.only_update:
1285-
print("--skip-version-update and --only-update are mutually exclusive.")
1284+
if args.skip and args.only:
1285+
print("--skip and --only are mutually exclusive.")
12861286
sys.exit(1)
12871287

1288-
only_update = set(args.only_update)
1289-
skip_version_updates = set(args.skip_version_update)
1288+
only_update = set(args.only)
1289+
if only_update:
1290+
print(f"Only updating {' '.join(only_update)}.")
1291+
1292+
skip_update = set(args.skip)
1293+
if skip_update:
1294+
print(f"Skipping updates for {' '.join(skip_update)}.")
12901295

12911296
# Process packages
12921297
packages = defaultdict(list)
@@ -1301,7 +1306,7 @@ def main() -> dict[str, list]:
13011306
package, extra = _get_package_name(integration)
13021307

13031308
test_releases = None
1304-
skip = integration in skip_version_updates or (
1309+
skip = integration in skip_update or (
13051310
only_update and integration not in only_update
13061311
)
13071312
if skip:

0 commit comments

Comments
 (0)