Merge branch 'main' into dict-comp-unparse

Author: StanFromIreland

.github/CODEOWNERS

@@ -260,33 +260,33 @@ Include/pyhash.h                 @gpshead @picnixz
 Python/pyhash.c                  @gpshead @picnixz
 
 # The import system (including importlib)
-**/*import*                   @brettcannon @ericsnowcurrently @ncoghlan @warsaw
-Python/import.c               @brettcannon @ericsnowcurrently @ncoghlan @warsaw @kumaraditya303
+**/*import*                   @brettcannon @ericsnowcurrently @ncoghlan @warsaw @FFY00
+Python/import.c               @brettcannon @ericsnowcurrently @ncoghlan @warsaw @FFY00 @kumaraditya303
 **/*freeze*                   @ericsnowcurrently
 **/*frozen*                   @ericsnowcurrently
 **/*modsupport*               @ericsnowcurrently
-**/*modulefinder*             @ericsnowcurrently
+**/*modulefinder*             @ericsnowcurrently @FFY00
 **/*moduleobject*             @ericsnowcurrently
 **/*multiphase*               @ericsnowcurrently
-**/*pkgutil*                  @ericsnowcurrently
+**/*pkgutil*                  @ericsnowcurrently @FFY00
 **/*pythonrun*                @ericsnowcurrently
-**/*runpy*                    @ericsnowcurrently
+**/*runpy*                    @ericsnowcurrently @FFY00
 **/*singlephase*              @ericsnowcurrently
 Doc/c-api/module.rst          @ericsnowcurrently
 Lib/test/test_module/         @ericsnowcurrently
-Python/dynload_*.c            @ericsnowcurrently
+Python/dynload_*.c            @ericsnowcurrently @FFY00
 
 # Initialisation
-**/*initconfig*               @ericsnowcurrently
-**/*pathconfig*               @ericsnowcurrently
-**/*preconfig*                @ericsnowcurrently
+**/*initconfig*               @ericsnowcurrently @FFY00
+**/*pathconfig*               @ericsnowcurrently @FFY00
+**/*preconfig*                @ericsnowcurrently @FFY00
 Doc/library/sys_path_init.rst @FFY00
 Doc/c-api/init_config.rst     @FFY00
 
 # Interpreter main program
-Modules/main.c                @ericsnowcurrently
-Programs/_bootstrap_python.c  @ericsnowcurrently
-Programs/python.c             @ericsnowcurrently
+Modules/main.c                @ericsnowcurrently @FFY00
+Programs/_bootstrap_python.c  @ericsnowcurrently @FFY00
+Programs/python.c             @ericsnowcurrently @FFY00
 
 # JIT
 .github/workflows/jit.yml     @savannahostrowski
@@ -316,8 +316,8 @@ Tools/peg_generator/          @pablogsal @lysnikolaou
 
 # Runtime state/lifecycle
 **/*gil*                      @ericsnowcurrently
-**/*pylifecycle*              @ericsnowcurrently @ZeroIntensity
-**/*pystate*                  @ericsnowcurrently @ZeroIntensity
+**/*pylifecycle*              @ericsnowcurrently @ZeroIntensity @FFY00
+**/*pystate*                  @ericsnowcurrently @ZeroIntensity @FFY00
 Include/internal/pycore_*_init.h          @ericsnowcurrently
 Include/internal/pycore_*_state.h         @ericsnowcurrently
 Include/internal/pycore_atexit.h          @ericsnowcurrently
@@ -505,13 +505,13 @@ Lib/idlelib/                  @terryjreedy
 Lib/turtledemo/               @terryjreedy
 
 # importlib.metadata
-Doc/library/importlib.metadata.rst  @jaraco @warsaw
-Lib/importlib/metadata/             @jaraco @warsaw
-Lib/test/test_importlib/metadata/   @jaraco @warsaw
+Doc/library/importlib.metadata.rst  @jaraco @warsaw @FFY00
+Lib/importlib/metadata/             @jaraco @warsaw @FFY00
+Lib/test/test_importlib/metadata/   @jaraco @warsaw @FFY00
 
 # importlib.resources
-Doc/library/importlib.resources.abc.rst   @jaraco @warsaw
-Doc/library/importlib.resources.rst       @jaraco @warsaw
+Doc/library/importlib.resources.abc.rst   @jaraco @warsaw @FFY00
+Doc/library/importlib.resources.rst       @jaraco @warsaw @FFY00
 Lib/importlib/resources/                  @jaraco @warsaw @FFY00
 Lib/test/test_importlib/resources/        @jaraco @warsaw @FFY00
 

.github/actionlint.yaml

@@ -1,7 +1,3 @@
-self-hosted-runner:
-  # Pending https://github.com/rhysd/actionlint/pull/615
-  labels: ["windows-2025-vs2026"]
-
 config-variables: null
 
 paths:

.github/workflows/reusable-wasi.yml

@@ -13,8 +13,6 @@ jobs:
     timeout-minutes: 60
     env:
       WASMTIME_VERSION: 38.0.3
-      WASI_SDK_VERSION: 30
-      WASI_SDK_PATH: /opt/wasi-sdk
       CROSS_BUILD_PYTHON: cross-build/build
       CROSS_BUILD_WASI: cross-build/wasm32-wasip1
     steps:
@@ -26,18 +24,23 @@ jobs:
       uses: bytecodealliance/actions/wasmtime/setup@v1
       with:
         version: ${{ env.WASMTIME_VERSION }}
-    - name: "Restore WASI SDK"
-      id: cache-wasi-sdk
-      uses: actions/cache@v5
-      with:
-        path: ${{ env.WASI_SDK_PATH }}
-        key: ${{ runner.os }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}
-    - name: "Install WASI SDK"  # Hard-coded to x64.
-      if: steps.cache-wasi-sdk.outputs.cache-hit != 'true'
+    - name: "Read WASI SDK version"
+      id: wasi-sdk-version
       run: |
-        mkdir "${WASI_SDK_PATH}" && \
-        curl -s -S --location "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-arm64-linux.tar.gz" | \
-        tar --strip-components 1 --directory "${WASI_SDK_PATH}" --extract --gunzip
+        import tomllib
+        from pathlib import Path
+        import os
+        config = tomllib.loads(Path("Platforms/WASI/config.toml").read_text())
+        version = config["targets"]["wasi-sdk"]
+        with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+            f.write(f"version={version}\n")
+      shell: python
+    - name: "Install WASI SDK"
+      id: install-wasi-sdk
+      uses: bytecodealliance/setup-wasi-sdk-action@b2de090b44eb70013ee96b393727d473b35e1728
+      with:
+        version: ${{ steps.wasi-sdk-version.outputs.version }}
+        add-to-path: false
     - name: "Install Python"
       uses: actions/setup-python@v6
       with:
@@ -51,6 +54,8 @@ jobs:
     - name: "Configure host"
       # `--with-pydebug` inferred from configure-build-python
       run: python3 Platforms/WASI configure-host -- --config-cache
+      env:
+        WASI_SDK_PATH: ${{ steps.install-wasi-sdk.outputs.wasi-sdk-path }}
     - name: "Make host"
       run: python3 Platforms/WASI make-host
     - name: "Display build info"

.github/zizmor.yml

@@ -1,5 +1,5 @@
 # Configuration for the zizmor static analysis tool, run via prek in CI
-# https://woodruffw.github.io/zizmor/configuration/
+# https://docs.zizmor.sh/configuration/
 rules:
   dangerous-triggers:
     ignore:

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.0
+    rev: a27a2e47c7751b639d2b5badf0ef6ff11fee893f  # frozen: v0.15.4
     hooks:
       - id: ruff-check
         name: Run Ruff (lint) on Apple/
@@ -14,6 +14,10 @@ repos:
         name: Run Ruff (lint) on Lib/test/
         args: [--exit-non-zero-on-fix]
         files: ^Lib/test/
+      - id: ruff-check
+        name: Run Ruff (lint) on Platforms/WASI/
+        args: [--exit-non-zero-on-fix, --config=Platforms/WASI/.ruff.toml]
+        files: ^Platforms/WASI/
       - id: ruff-check
         name: Run Ruff (lint) on Tools/build/
         args: [--exit-non-zero-on-fix, --config=Tools/build/.ruff.toml]
@@ -42,6 +46,10 @@ repos:
         name: Run Ruff (format) on Doc/
         args: [--exit-non-zero-on-fix]
         files: ^Doc/
+      - id: ruff-format
+        name: Run Ruff (format) on Platforms/WASI/
+        args: [--exit-non-zero-on-fix, --config=Platforms/WASI/.ruff.toml]
+        files: ^Platforms/WASI/
       - id: ruff-format
         name: Run Ruff (format) on Tools/build/check_warnings.py
         args: [--exit-non-zero-on-fix, --config=Tools/build/.ruff.toml]
@@ -52,20 +60,20 @@ repos:
         files: ^Tools/wasm/
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.1.0
+    rev: ea488cebbfd88a5f50b8bd95d5c829d0bb76feb8  # frozen: 26.1.0
     hooks:
       - id: black
         name: Run Black on Tools/jit/
         files: ^Tools/jit/
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.5.6
+    rev: ad1b27d73581aa16cca06fc4a0761fc563ffe8e8  # frozen: v1.5.6
     hooks:
       - id: remove-tabs
         types: [python]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c  # frozen: v6.0.0
     hooks:
       - id: check-case-conflict
       - id: check-merge-conflict
@@ -83,24 +91,24 @@ repos:
         files: '^\.github/CODEOWNERS|\.(gram)$'
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.36.1
+    rev: 9f48a48aa91a6040d749ad68ec70907d907a5a7f  # frozen: 0.37.0
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
       - id: check-readthedocs
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.10
+    rev: 393031adb9afb225ee52ae2ccd7a5af5525e03e8  # frozen: v1.7.11
     hooks:
       - id: actionlint
 
-  - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.22.0
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: b546b77c44c466a54a42af5499dcc0dcc1a3193f  # frozen: v1.22.0
     hooks:
       - id: zizmor
 
   - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: v1.0.2
+    rev: c883505f64b59c3c5c9375191e4ad9f98e727ccd  # frozen: v1.0.2
     hooks:
       - id: sphinx-lint
         args: [--enable=default-role]

Doc/Makefile

@@ -58,7 +58,7 @@ build:
 	@if [ -f  ../Misc/NEWS ] ; then \
 		echo "Using existing Misc/NEWS file"; \
 		cp ../Misc/NEWS build/NEWS; \
-	elif $(BLURB) help >/dev/null 2>&1 && $(SPHINXBUILD) --version >/dev/null 2>&1; then \
+	elif $(BLURB) --version && $(SPHINXBUILD) --version ; then \
 		if [ -d ../Misc/NEWS.d ]; then \
 			echo "Building NEWS from Misc/NEWS.d with blurb"; \
 			$(BLURB) merge -f build/NEWS; \

Doc/c-api/dict.rst

@@ -82,10 +82,6 @@ Dictionary objects
 
    Return a new dictionary that contains the same key-value pairs as *p*.
 
-   .. versionchanged:: next
-      If *p* is a subclass of :class:`frozendict`, the result will be a
-      :class:`frozendict` instance instead of a :class:`dict` instance.
-
 .. c:function:: int PyDict_SetItem(PyObject *p, PyObject *key, PyObject *val)
 
    Insert *val* into the dictionary *p* with a key of *key*.  *key* must be

Doc/c-api/init_config.rst

@@ -2299,13 +2299,91 @@ Py_GetArgcArgv()
 
    See also :c:member:`PyConfig.orig_argv` member.
 
-Delaying main module execution
-==============================
 
-In some embedding use cases, it may be desirable to separate interpreter initialization
-from the execution of the main module.
+Multi-Phase Initialization Private Provisional API
+==================================================
 
-This separation can be achieved by setting ``PyConfig.run_command`` to the empty
-string during initialization (to prevent the interpreter from dropping into the
-interactive prompt), and then subsequently executing the desired main module
-code using ``__main__.__dict__`` as the global namespace.
+This section is a private provisional API introducing multi-phase
+initialization, the core feature of :pep:`432`:
+
+* "Core" initialization phase, "bare minimum Python":
+
+  * Builtin types;
+  * Builtin exceptions;
+  * Builtin and frozen modules;
+  * The :mod:`sys` module is only partially initialized
+    (ex: :data:`sys.path` doesn't exist yet).
+
+* "Main" initialization phase, Python is fully initialized:
+
+  * Install and configure :mod:`importlib`;
+  * Apply the :ref:`Path Configuration <init-path-config>`;
+  * Install signal handlers;
+  * Finish :mod:`sys` module initialization (ex: create :data:`sys.stdout`
+    and :data:`sys.path`);
+  * Enable optional features like :mod:`faulthandler` and :mod:`tracemalloc`;
+  * Import the :mod:`site` module;
+  * etc.
+
+Private provisional API:
+
+.. c:member:: int PyConfig._init_main
+
+   If set to ``0``, :c:func:`Py_InitializeFromConfig` stops at the "Core"
+   initialization phase.
+
+.. c:function:: PyStatus _Py_InitializeMain(void)
+
+   Move to the "Main" initialization phase, finish the Python initialization.
+
+No module is imported during the "Core" phase and the ``importlib`` module is
+not configured: the :ref:`Path Configuration <init-path-config>` is only
+applied during the "Main" phase. It may allow to customize Python in Python to
+override or tune the :ref:`Path Configuration <init-path-config>`, maybe
+install a custom :data:`sys.meta_path` importer or an import hook, etc.
+
+It may become possible to calculate the :ref:`Path Configuration
+<init-path-config>` in Python, after the Core phase and before the Main phase,
+which is one of the :pep:`432` motivation.
+
+The "Core" phase is not properly defined: what should be and what should
+not be available at this phase is not specified yet. The API is marked
+as private and provisional: the API can be modified or even be removed
+anytime until a proper public API is designed.
+
+Example running Python code between "Core" and "Main" initialization
+phases::
+
+    void init_python(void)
+    {
+        PyStatus status;
+
+        PyConfig config;
+        PyConfig_InitPythonConfig(&config);
+        config._init_main = 0;
+
+        /* ... customize 'config' configuration ... */
+
+        status = Py_InitializeFromConfig(&config);
+        PyConfig_Clear(&config);
+        if (PyStatus_Exception(status)) {
+            Py_ExitStatusException(status);
+        }
+
+        /* Use sys.stderr because sys.stdout is only created
+           by _Py_InitializeMain() */
+        int res = PyRun_SimpleString(
+            "import sys; "
+            "print('Run Python code before _Py_InitializeMain', "
+                   "file=sys.stderr)");
+        if (res < 0) {
+            exit(1);
+        }
+
+        /* ... put more configuration code here ... */
+
+        status = _Py_InitializeMain();
+        if (PyStatus_Exception(status)) {
+            Py_ExitStatusException(status);
+        }
+    }

Doc/conf.py

@@ -43,6 +43,7 @@
 
 # Skip if downstream redistributors haven't installed them
 _OPTIONAL_EXTENSIONS = (
+    'linklint.ext',
     'notfound.extension',
     'sphinxext.opengraph',
 )

Doc/deprecations/pending-removal-in-3.18.rst

@@ -1,6 +1,9 @@
 Pending removal in Python 3.18
 ------------------------------
 
+* No longer accept a boolean value when a file descriptor is expected.
+  (Contributed by Serhiy Storchaka in :gh:`82626`.)
+
 * :mod:`decimal`:
 
   * The non-standard and undocumented :class:`~decimal.Decimal` format