Merge branch 'main' into 81719-zipfile-refactor-for-subclass

Author: adiroiban

.github/CODEOWNERS

@@ -4,17 +4,23 @@
 # It uses the same pattern rule for gitignore file
 # https://git-scm.com/docs/gitignore#_pattern_format
 
-# GitHub
+# Azure Pipelines
+.azure-pipelines/             @AA-Turner
+
+# GitHub & related scripts
 .github/**                    @ezio-melotti @hugovk @AA-Turner
+Tools/build/compute-changes.py @AA-Turner
+Tools/build/verify_ensurepip_wheels.py @AA-Turner
 
 # pre-commit
-.pre-commit-config.yaml       @hugovk @AlexWaygood
+.pre-commit-config.yaml       @hugovk
 .ruff.toml                    @hugovk @AlexWaygood @AA-Turner
 
-# Build system
-configure*                    @erlend-aasland @corona10
-Makefile.pre.in               @erlend-aasland
-Modules/Setup*                @erlend-aasland
+# Build system (autotools)
+configure*                    @erlend-aasland @corona10 @AA-Turner
+Makefile.pre.in               @erlend-aasland @AA-Turner
+Modules/Setup*                @erlend-aasland @AA-Turner
+Tools/build/regen-configure.sh @AA-Turner
 
 # argparse
 **/*argparse*                 @savannahostrowski
@@ -67,6 +73,7 @@ Doc/make.bat                  @AA-Turner @hugovk
 Doc/requirements.txt          @AA-Turner @hugovk
 Doc/_static/**                @AA-Turner @hugovk
 Doc/tools/**                  @AA-Turner @hugovk
+.readthedocs.yml              @AA-Turner
 
 # runtime state/lifecycle
 **/*pylifecycle*              @ericsnowcurrently @ZeroIntensity
@@ -155,6 +162,10 @@ Doc/c-api/module.rst          @ericsnowcurrently
 **/*importlib/resources/*     @jaraco @warsaw @FFY00
 **/*importlib/metadata/*       @jaraco @warsaw
 
+# Calendar
+Lib/calendar.py               @AA-Turner
+Lib/test/test_calendar.py     @AA-Turner
+
 # Dates and times
 **/*datetime*                 @pganssle @abalkin
 **/*str*time*                 @pganssle @abalkin
@@ -205,6 +216,11 @@ Lib/test/test_ast/            @eclips4 @tomasr8
 # multiprocessing
 **/*multiprocessing*          @gpshead
 
+# pydoc
+Lib/pydoc.py                  @AA-Turner
+Lib/pydoc_data/               @AA-Turner
+Lib/test/test_pydoc/          @AA-Turner
+
 # SQLite 3
 **/*sqlite*                   @berkerpeksag @erlend-aasland
 
@@ -217,6 +233,11 @@ Lib/test/test_ast/            @eclips4 @tomasr8
 **/*pdb*                      @gaogaotiantian
 **/*bdb*                      @gaogaotiantian
 
+# types
+Lib/test/test_types.py        @AA-Turner
+Lib/types.py                  @AA-Turner
+Modules/_typesmodule.c        @AA-Turner
+
 # Limited C API & stable ABI
 Tools/build/stable_abi.py     @encukou
 Misc/stable_abi.toml          @encukou
@@ -234,6 +255,11 @@ Doc/c-api/stable.rst          @encukou
 /Tools/msi/                   @python/windows-team
 /Tools/nuget/                 @python/windows-team
 
+# Zstandard
+Lib/compression/zstd/         @AA-Turner
+Lib/test/test_zstd.py         @AA-Turner
+Modules/_zstd/                @AA-Turner
+
 # Misc
 **/*itertools*                @rhettinger
 **/*collections*              @rhettinger
@@ -266,6 +292,9 @@ Doc/c-api/stable.rst          @encukou
 
 **/*cjkcodecs*                @corona10
 
+# Patchcheck
+Tools/patchcheck/             @AA-Turner
+
 # macOS
 /Mac/                         @python/macos-team
 **/*osx_support*              @python/macos-team
@@ -277,9 +306,9 @@ Doc/c-api/stable.rst          @encukou
 **/*zipfile/_path/*           @jaraco
 
 # Argument Clinic
-/Tools/clinic/**              @erlend-aasland
-/Lib/test/test_clinic.py      @erlend-aasland
-Doc/howto/clinic.rst          @erlend-aasland
+/Tools/clinic/**              @erlend-aasland @AA-Turner
+/Lib/test/test_clinic.py      @erlend-aasland @AA-Turner
+Doc/howto/clinic.rst          @erlend-aasland @AA-Turner
 
 # Subinterpreters
 **/*interpreteridobject.*     @ericsnowcurrently
@@ -323,6 +352,7 @@ Lib/test/test_configparser.py @jaraco
 
 # Doc sections
 Doc/reference/                @willingc @AA-Turner
+Doc/whatsnew/                 @AA-Turner
 
 **/*weakref*                  @kumaraditya303
 
@@ -336,7 +366,7 @@ Modules/_xxtestfuzz/          @ammaraskar
 # t-strings
 **/*interpolationobject*      @lysnikolaou
 **/*templateobject*           @lysnikolaou
-**/*templatelib*              @lysnikolaou
+**/*templatelib*              @lysnikolaou @AA-Turner
 **/*tstring*                  @lysnikolaou
 
 # Remote debugging
@@ -346,3 +376,6 @@ Modules/_remote_debugging_module.c @pablogsal @ambv @1st1
 
 # gettext
 **/*gettext*                  @tomasr8
+
+# Internal Docs
+InternalDocs/                 @AA-Turner

.github/CONTRIBUTING.rst

@@ -4,7 +4,7 @@ Contributing to Python
 Build Status
 ------------
 
-- `Buildbot status overview <https://buildbot.python.org/all/#/release_status>`_
+- `Buildbot status overview <https://buildbot.python.org/#/release_status>`_
 
 - `GitHub Actions status <https://github.com/python/cpython/actions/workflows/build.yml>`_
 

.github/workflows/build.yml

@@ -178,8 +178,8 @@ jobs:
       free-threading: ${{ matrix.free-threading }}
 
   build-windows-msi:
-    name: >-  # ${{ '' } is a hack to nest jobs under the same sidebar category
-      Windows MSI${{ '' }}
+    # ${{ '' } is a hack to nest jobs under the same sidebar category.
+    name: Windows MSI${{ '' }}  # zizmor: ignore[obfuscation]
     needs: build-context
     if: fromJSON(needs.build-context.outputs.run-windows-msi)
     strategy:
@@ -586,8 +586,8 @@ jobs:
       run: xvfb-run make ci
 
   build-san:
-    name: >-  # ${{ '' } is a hack to nest jobs under the same sidebar category
-      Sanitizers${{ '' }}
+    # ${{ '' } is a hack to nest jobs under the same sidebar category.
+    name: Sanitizers${{ '' }}  # zizmor: ignore[obfuscation]
     needs: build-context
     if: needs.build-context.outputs.run-tests == 'true'
     strategy:

.github/workflows/reusable-docs.yml

@@ -75,18 +75,6 @@ jobs:
           --fail-if-regression \
           --fail-if-improved \
           --fail-if-new-news-nit
-    - name: 'Build EPUB documentation'
-      continue-on-error: true
-      run: |
-        set -Eeuo pipefail
-        make -C Doc/ PYTHON=../python SPHINXOPTS="--quiet" epub
-        pip install epubcheck
-        epubcheck Doc/build/epub/Python.epub &> Doc/epubcheck.txt
-    - name: 'Check for fatal errors in EPUB'
-      if: github.event_name == 'pull_request'
-      continue-on-error: true  # until gh-136155 is fixed
-      run: |
-        python Doc/tools/check-epub.py
 
   # Run "doctest" on HEAD as new syntax doesn't exist in the latest stable release
   doctest:
@@ -114,3 +102,30 @@ jobs:
     # Use "xvfb-run" since some doctest tests open GUI windows
     - name: 'Run documentation doctest'
       run: xvfb-run make -C Doc/ PYTHON=../python SPHINXERRORHANDLING="--fail-on-warning" doctest
+
+  check-epub:
+    name: 'Check EPUB'
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - name: 'Set up Python'
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3'
+        cache: 'pip'
+        cache-dependency-path: 'Doc/requirements.txt'
+    - name: 'Install build dependencies'
+      run: |
+        make -C Doc/ venv
+        python -m pip install epubcheck
+    - name: 'Build EPUB documentation'
+      run: make -C Doc/ PYTHON=../python epub
+    - name: 'Run epubcheck'
+      continue-on-error: true
+      run: epubcheck Doc/build/epub/Python.epub &> Doc/epubcheck.txt
+    - run: cat Doc/epubcheck.txt
+    - name: 'Check for fatal errors in EPUB'
+      run: python Doc/tools/check-epub.py

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.12.8
     hooks:
       - id: ruff
         name: Run Ruff (lint) on Doc/
@@ -42,7 +42,7 @@ repos:
         exclude: ^Tools/c-analyzer/cpython/_parser.py
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-case-conflict
       - id: check-merge-conflict
@@ -60,7 +60,7 @@ repos:
         files: '^\.github/CODEOWNERS|\.(gram)$'
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.0
+    rev: 0.33.2
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
@@ -72,7 +72,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.6.0
+    rev: v1.11.0
     hooks:
       - id: zizmor
 

.well-known/funding-manifest-urls

@@ -0,0 +1 @@
+https://www.python.org/funding.json

Android/android.py

@@ -187,7 +187,7 @@ def unpack_deps(host, prefix_dir):
     os.chdir(prefix_dir)
     deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
     for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.15-4",
-                     "sqlite-3.49.1-0", "xz-5.4.6-1", "zstd-1.5.7-1"]:
+                     "sqlite-3.50.4-0", "xz-5.4.6-1", "zstd-1.5.7-1"]:
         filename = f"{name_ver}-{host}.tar.gz"
         download(f"{deps_url}/{name_ver}/{filename}")
         shutil.unpack_archive(filename)