From 5073dab6169cc2db0e7f47fa9a2029b99dfefdc2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:45:08 +0200 Subject: [PATCH 1/3] PEP 761: Python 3.14+ discontinues PGP signatures --- run_release.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/run_release.py b/run_release.py index 1267a5b..7657baa 100755 --- a/run_release.py +++ b/run_release.py @@ -1264,7 +1264,8 @@ def _api_key(api_key: str) -> str: "This release script is not compatible with the running platform" ) - no_gpg = args.no_gpg + release_tag = release_mod.Tag(args.release) + no_gpg = args.no_gpg or release_tag.as_tuple() >= (3, 14) tasks = [ Task(check_git, "Checking Git is available"), Task(check_make, "Checking make is available"), @@ -1329,10 +1330,10 @@ def _api_key(api_key: str) -> str: ] automata = ReleaseDriver( git_repo=args.repo, - release_tag=release_mod.Tag(args.release), + release_tag=release_tag, api_key=auth_key, ssh_user=args.ssh_user, - sign_gpg=not args.no_gpg, + sign_gpg=not no_gpg, tasks=tasks, ) automata.run() From c79c8eaf592163860ac533849c2ce357cf584da1 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:52:55 +0200 Subject: [PATCH 2/3] Remove --no-gpg argument --- run_release.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/run_release.py b/run_release.py index 7657baa..1bee9ec 100755 --- a/run_release.py +++ b/run_release.py @@ -1239,11 +1239,6 @@ def _api_key(api_key: str) -> str: help="Username to be used when authenticating via ssh", type=str, ) - parser.add_argument( - "--no-gpg", - action="store_true", - help="Skip GPG signing", - ) args = parser.parse_args() auth_key = args.auth_key or os.getenv("AUTH_INFO") @@ -1265,7 +1260,7 @@ def _api_key(api_key: str) -> str: ) release_tag = release_mod.Tag(args.release) - no_gpg = args.no_gpg or release_tag.as_tuple() >= (3, 14) + no_gpg = release_tag.as_tuple() >= (3, 14) tasks = [ Task(check_git, "Checking Git is available"), Task(check_make, "Checking make is available"), From 024f88c73a9d70aaea2b8508cb85267b2b7f7439 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Nov 2024 21:13:21 +0200 Subject: [PATCH 3/3] Reference the PEP Co-authored-by: Jelle Zijlstra --- run_release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_release.py b/run_release.py index 1bee9ec..734933a 100755 --- a/run_release.py +++ b/run_release.py @@ -1260,7 +1260,7 @@ def _api_key(api_key: str) -> str: ) release_tag = release_mod.Tag(args.release) - no_gpg = 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"), Task(check_make, "Checking make is available"),