Merge branch 'main' into signing-certificate-force-source-commit

Author: sethmlarson

.github/workflows/build-release.yml

@@ -147,7 +147,7 @@ jobs:
           python ../release.py --export "$CPYTHON_RELEASE" --skip-docs
 
       - name: "Upload the source artifacts"
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: source
           path: |
@@ -187,7 +187,7 @@ jobs:
           make dist-text
 
       - name: "Upload the docs artifacts"
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: docs
           path: |
@@ -296,7 +296,7 @@ jobs:
       - name: Build and test
         run: python3 Platforms/Android ci --fast-ci "$triplet"
 
-      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: ${{ env.triplet }}
           path: cross-build/${{ env.triplet }}/dist/*
@@ -320,7 +320,8 @@ jobs:
       - name: Build and test
         run: python3 Platforms/Apple ci iOS --slow-ci
 
-      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
+          name: ios
           path: cross-build/dist/*
           if-no-files-found: error

.github/workflows/lint.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           python-version: "3.x"
           cache: pip
-      - uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
+      - uses: j178/prek-action@cbc2f23eb5539cf20d82d1aabd0d0ecbcc56f4e3 # v2.0.2
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -31,6 +31,6 @@ jobs:
           tox -e py
 
       - name: Upload coverage
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           token: ${{ secrets.CODECOV_ORG_TOKEN }}

add_to_pydotorg.py

@@ -30,6 +30,7 @@
 import subprocess
 import sys
 from collections.abc import Generator
+from functools import cache
 from os import path
 from typing import Any, NoReturn
 
@@ -293,6 +294,7 @@ def list_files(
             continue
 
 
+@cache
 def query_object(base_url: str, objtype: str, **params: Any) -> int:
     """Find an API object by query parameters."""
     uri = base_url + f"downloads/{objtype}/"
@@ -366,9 +368,9 @@ def has_sigstore_signature(filename: str) -> bool:
                 ]
             )
 
-            run_cmd(["chmod", "644", sig_file])
-            run_cmd(["chmod", "644", cert_file])
-            run_cmd(["chmod", "644", bundle_file])
+            os.chmod(sig_file, 0o644)
+            os.chmod(cert_file, 0o644)
+            os.chmod(bundle_file, 0o644)
     else:
         print("All release files already signed with Sigstore")
 

dev-requirements.txt

@@ -340,9 +340,9 @@ frozenlist==1.5.0 \
     # via
     #   aiohttp
     #   aiosignal
-idna==3.10 \
-    --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
-    --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
+idna==3.15 \
+    --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \
+    --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc
     # via yarl
 iniconfig==2.0.0 \
     --hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
@@ -540,9 +540,9 @@ propcache==0.2.1 \
     # via
     #   aiohttp
     #   yarl
-pyfakefs==6.1.6 \
-    --hash=sha256:28e620e117b9728d7f8ebb50f9537da6ab36ef9c0bebc12469aaba3c72759ff7 \
-    --hash=sha256:dcdfc09b13f3fd464142e20ef6154639bd26fb0890572c5dd869339a083e2903
+pyfakefs==6.2.0 \
+    --hash=sha256:0968a49db692694ffed420e54a9f1cbae4636637b880e8ab09c8ccc0f11bd7ae \
+    --hash=sha256:e59a36db447bf509ce9c97ab3d1510c08cc51895c5311325a560a5e5b5dc1940
     # via -r dev-requirements.in
 pygments==2.20.0 \
     --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \

mypy-requirements.txt

@@ -1,6 +1,6 @@
-aiohttp==3.13.4
+aiohttp==3.13.5
 alive_progress>=3.3.0
-mypy==1.19.1
+mypy==1.20.2
 pyfakefs
 pytest
 pytest-mock

release.py

@@ -193,7 +193,9 @@ def normalized(self) -> str:
 
     @property
     def branch(self) -> str:
-        return "main" if self.is_alpha_release else f"{self.major}.{self.minor}"
+        if self.is_alpha_release or self.is_feature_freeze_release:
+            return "main"
+        return f"{self.major}.{self.minor}"
 
     @property
     def is_alpha_release(self) -> bool:
@@ -553,11 +555,18 @@ def bump(tag: Tag) -> None:
             "Doc/tutorial/interpreter.rst",
             "Doc/tutorial/stdlib.rst",
             "Doc/tutorial/stdlib2.rst",
-            "PC/pyconfig.h.in",
-            "PCbuild/rt.bat",
+            "Include/internal/pycore_magic_number.h",
+            "PC/launcher.c",
+            "PC/pyconfig.h",
             ".github/ISSUE_TEMPLATE/bug.yml",
             ".github/ISSUE_TEMPLATE/crash.yml",
         ]
+
+    if extra_work:
+        print(
+            "\n*** configure.ac will be edited; you must re-run autotools afterwards! ***"
+        )
+
     print("\nManual editing time...")
     for filename in other_files:
         if os.path.exists(filename):
@@ -568,7 +577,12 @@ def bump(tag: Tag) -> None:
 
     print("Bumped revision")
     if extra_work:
-        print("configure.ac has changed; re-run autotools!")
+        if ask_question(
+            "configure.ac has changed; run 'Tools/build/regen-configure.sh'?"
+        ):
+            run_cmd(["Tools/build/regen-configure.sh"])
+        else:
+            print("configure.ac has changed; re-run autotools!")
     print("Please commit and use --tag")
 
 

requirements.txt

@@ -533,8 +533,8 @@ hyperframe==6.1.0 \
 id==1.5.0 \
     --hash=sha256:f1434e1cef91f2cbb8a4ec64663d5a23b9ed43ef44c4c957d02583d61714c658
     # via sigstore
-idna==3.10 \
-    --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
+idna==3.15 \
+    --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8
     # via
     #   email-validator
     #   requests
@@ -969,8 +969,8 @@ typing-extensions==4.15.0 \
 typing-inspection==0.4.2 \
     --hash=sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7
     # via pydantic
-urllib3==2.6.3 \
-    --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4
+urllib3==2.7.0 \
+    --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897
     # via
     #   requests
     #   tuf