Update run_release.py

Author: mhsmith

run_release.py

@@ -563,21 +563,26 @@ def create_tag(db: ReleaseShelf) -> None:
     )
 
 
-def wait_for_source_and_docs_artifacts(db: ReleaseShelf) -> None:
-    # Determine if we need to wait for docs or only source artifacts.
+def wait_for_build_release(db: ReleaseShelf) -> None:
+    # Determine if we need to wait for docs.
     release_tag = db["release"]
     should_wait_for_docs = release_tag.includes_docs
 
     # Create the directory so it's easier to place the artifacts there.
     release_path = Path(db["git_repo"] / str(release_tag))
-    src_path = release_path / "src"
-    src_path.mkdir(parents=True, exist_ok=True)
+    downloads_path = release_path / "downloads"
+    downloads_path.mkdir(parents=True, exist_ok=True)
 
     # Build the list of filepaths we're expecting.
     wait_for_paths = [
-        src_path / f"Python-{release_tag}.tgz",
-        src_path / f"Python-{release_tag}.tar.xz",
+        downloads_path / f"Python-{release_tag}.tgz",
+        downloads_path / f"Python-{release_tag}.tar.xz",
     ]
+    if release_tag.as_tuple() >= (3, 14):
+        wait_for_paths += [
+            downloads_path / f"python-{release_tag}-{arch}-linux-android.tar.gz"
+            for arch in ["aarch64", "x86_64"]
+        ]
     if should_wait_for_docs:
         docs_path = release_path / "docs"
         docs_path.mkdir(parents=True, exist_ok=True)
@@ -595,12 +600,12 @@ def wait_for_source_and_docs_artifacts(db: ReleaseShelf) -> None:
             ]
         )
 
-    print(
-        f"Waiting for source{' and docs' if should_wait_for_docs else ''} artifacts to be built"
-    )
-    print(f"Artifacts should be placed at '{release_path}':")
+    print("Once the build-release workflow is complete:")
+    print("- Download its artifacts from the workflow summary page.")
+    print(f"- Copy the following files into {release_path}:")
     for path in wait_for_paths:
-        print(f"- '{os.path.relpath(path, release_path)}'")
+        print(f"  - {os.path.relpath(path, release_path)}")
+    print("The script will continue once all files are present.")
 
     while not all(path.exists() for path in wait_for_paths):
         time.sleep(1)
@@ -636,7 +641,7 @@ def sign_source_artifacts(db: ReleaseShelf) -> None:
         subprocess.check_call('gpg -K | grep -A 1 "^sec"', shell=True)
         uid = input("Please enter key ID to use for signing: ")
 
-    tarballs_path = Path(db["git_repo"] / str(db["release"]) / "src")
+    tarballs_path = Path(db["git_repo"] / str(db["release"]) / "downloads")
     tgz = str(tarballs_path / f"Python-{db['release']}.tgz")
     xz = str(tarballs_path / f"Python-{db['release']}.tar.xz")
 
@@ -678,7 +683,9 @@ def build_sbom_artifacts(db: ReleaseShelf) -> None:
     # For each source tarball build an SBOM.
     for ext in (".tgz", ".tar.xz"):
         tarball_name = f"Python-{release_version}{ext}"
-        tarball_path = str(db["git_repo"] / str(db["release"]) / "src" / tarball_name)
+        tarball_path = str(
+            db["git_repo"] / str(db["release"]) / "downloads" / tarball_name
+        )
 
         print(f"Building an SBOM for artifact '{tarball_name}'")
         sbom_data = sbom.create_sbom_for_source_tarball(tarball_path)
@@ -724,7 +731,7 @@ def upload_files_to_server(db: ReleaseShelf, server: str) -> None:
     transport = client.get_transport()
     assert transport is not None, f"SSH transport to {server} is None"
 
-    destination = Path(f"/home/psf-users/{db['ssh_user']}/{db['release']}")
+    destination = Path(f"/home/{db['ssh_user']}/{db['release']}")
     ftp_client = MySFTPClient.from_transport(transport)
     assert ftp_client is not None, f"SFTP client to {server} is None"
 
@@ -750,7 +757,7 @@ def upload_subdir(subdir: str) -> None:
     if server == DOCS_SERVER:
         upload_subdir("docs")
     elif server == DOWNLOADS_SERVER:
-        upload_subdir("src")
+        upload_subdir("downloads")
         if (artifacts_path / "docs").exists():
             upload_subdir("docs")
 
@@ -769,7 +776,7 @@ def place_files_in_download_folder(db: ReleaseShelf) -> None:
     transport = client.get_transport()
     assert transport is not None, f"SSH transport to {DOWNLOADS_SERVER} is None"
 
-    # Sources
+    # Downloads
 
     source = f"/home/psf-users/{db['ssh_user']}/{db['release']}"
     destination = f"/srv/www.python.org/ftp/python/{db['release'].normalized()}"
@@ -781,7 +788,7 @@ def execute_command(command: str) -> None:
             raise ReleaseException(channel.recv_stderr(1000))
 
     execute_command(f"mkdir -p {destination}")
-    execute_command(f"cp {source}/src/* {destination}")
+    execute_command(f"cp {source}/downloads/* {destination}")
     execute_command(f"chgrp downloads {destination}")
     execute_command(f"chmod 775 {destination}")
     execute_command(f"find {destination} -type f -exec chmod 664 {{}} \\;")
@@ -880,7 +887,7 @@ def get_origin_remote_url(git_repo: Path) -> str:
     return origin_remote_url
 
 
-def start_build_of_source_and_docs(db: ReleaseShelf) -> None:
+def start_build_release(db: ReleaseShelf) -> None:
     commit_sha = get_commit_sha(db["release"].gitname, db["git_repo"])
     origin_remote_url = get_origin_remote_url(db["git_repo"])
     origin_remote_github_owner = extract_github_owner(origin_remote_url)
@@ -922,8 +929,8 @@ def start_build_of_source_and_docs(db: ReleaseShelf) -> None:
     )
     print()
 
-    if not ask_question("Have you started the source and docs build?"):
-        raise ReleaseException("Source and docs build must be started")
+    if not ask_question("Have you started the build-release workflow?"):
+        raise ReleaseException("build-release workflow must be started")
 
 
 def send_email_to_platform_release_managers(db: ReleaseShelf) -> None:
@@ -936,7 +943,7 @@ def send_email_to_platform_release_managers(db: ReleaseShelf) -> None:
     print(f"{github_prefix}/{db['release'].gitname}")
     print(f"Git commit SHA: {commit_sha}")
     print(
-        "Source/docs build: https://github.com/python/release-tools/actions/runs/[ENTER-RUN-ID-HERE]"
+        "build-release workflow: https://github.com/python/release-tools/actions/runs/[ENTER-RUN-ID-HERE]"
     )
     print()
 
@@ -1363,18 +1370,12 @@ def _api_key(api_key: str) -> str:
         Task(check_cpython_repo_is_clean, "Checking Git repository is clean"),
         Task(create_tag, "Create tag"),
         Task(push_to_local_fork, "Push new tags and branches to private fork"),
-        Task(
-            start_build_of_source_and_docs,
-            "Start the builds for source and docs artifacts",
-        ),
+        Task(start_build_release, "Start the build-release workflow"),
         Task(
             send_email_to_platform_release_managers,
             "Platform release managers have been notified of the commit SHA",
         ),
-        Task(
-            wait_for_source_and_docs_artifacts,
-            "Wait for source and docs artifacts to build",
-        ),
+        Task(wait_for_build_release, "Wait for build-release workflow"),
         Task(check_doc_unreleased_version, "Check docs for `(unreleased)`"),
         Task(build_sbom_artifacts, "Building SBOM artifacts"),
         *([] if no_gpg else [Task(sign_source_artifacts, "Sign source artifacts")]),