Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions run_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ def __init__(
self.db["ssh_key"] = ssh_key
if not self.db.get("sign_gpg"):
self.db["sign_gpg"] = sign_gpg

if not self.db.get("release"):
self.db["release"] = release_tag

Expand Down Expand Up @@ -1397,6 +1396,7 @@ def _api_key(api_key: str) -> str:
)

release_tag = release_mod.Tag(args.release)
magic = release_tag.as_tuple() >= (3, 14)
no_gpg = release_tag.as_tuple() >= (3, 14) # see PEP 761
tasks = [
Task(check_git, "Checking Git is available"),
Expand All @@ -1413,7 +1413,11 @@ def _api_key(api_key: str) -> str:
Task(check_sigstore_client, "Checking Sigstore CLI"),
Task(check_buildbots, "Check buildbots are good"),
Task(check_cpython_repo_is_clean, "Checking Git repository is clean"),
Task(check_magic_number, "Checking the magic number is up-to-date"),
*(
[Task(check_magic_number, "Checking the magic number is up-to-date")]
if magic
else []
),
Task(prepare_temporary_branch, "Checking out a temporary release branch"),
Task(run_blurb_release, "Run blurb release"),
Task(check_cpython_repo_is_clean, "Checking Git repository is clean"),
Expand Down
2 changes: 1 addition & 1 deletion tests/test_run_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def test_invalid_extract_github_owner() -> None:

def test_check_magic_number() -> None:
db = {
"release": Tag("3.13.0rc1"),
"release": Tag("3.14.0rc1"),
"git_repo": str(Path(__file__).parent / "magicdata"),
}
with pytest.raises(
Expand Down