Merge branch 'main' into default-extras-pep

Author: astrofrog

Makefile

@@ -66,7 +66,7 @@ venv:
 	else \
 		echo "Creating venv in $(VENVDIR)"; \
 		if $(UV) --version >/dev/null 2>&1; then \
-			$(UV) venv $(VENVDIR); \
+			$(UV) venv --python=$(PYTHON) $(VENVDIR); \
 			VIRTUAL_ENV=$(VENVDIR) $(UV) pip install -r $(REQUIREMENTS); \
 		else \
 			$(PYTHON) -m venv $(VENVDIR); \

peps/pep-0011.rst

@@ -77,15 +77,16 @@ Tier 1
   platforms, working.
 - Failures on these platforms **block a release**.
 
-======================== =====
-Target Triple            Notes
-======================== =====
-aarch64-apple-darwin     clang
+========================= =====
+Target Triple             Notes
+========================= =====
+aarch64-apple-darwin      clang
+aarch64-unknown-linux-gnu glibc, gcc
 i686-pc-windows-msvc
 x86_64-pc-windows-msvc
-x86_64-apple-darwin      BSD libc, clang
-x86_64-unknown-linux-gnu glibc, gcc
-======================== =====
+x86_64-apple-darwin       BSD libc, clang
+x86_64-unknown-linux-gnu  glibc, gcc
+========================= =====
 
 
 Tier 2
@@ -101,9 +102,7 @@ Tier 2
 ============================= ========================== ========
 Target Triple                 Notes                      Contacts
 ============================= ========================== ========
-aarch64-unknown-linux-gnu     glibc, gcc                 Petr Viktorin, Victor Stinner
-
-                              glibc, clang               Victor Stinner, Gregory P. Smith
+aarch64-unknown-linux-gnu     glibc, clang               Victor Stinner, Gregory P. Smith
 wasm32-unknown-wasip1         WASI SDK, Wasmtime         Brett Cannon, Eric Snow
 x86_64-unknown-linux-gnu      glibc, clang               Victor Stinner, Gregory P. Smith
 ============================= ========================== ========

peps/pep-0735.rst

@@ -4,13 +4,15 @@ Author: Stephen Rosen <[email protected]>
 Sponsor: Brett Cannon <[email protected]>
 PEP-Delegate: Paul Moore <[email protected]>
 Discussions-To: https://discuss.python.org/t/39233
-Status: Accepted
+Status: Final
 Type: Standards Track
 Topic: Packaging
 Created: 20-Nov-2023
 Post-History: `14-Nov-2023 <https://discuss.python.org/t/29684>`__, `20-Nov-2023 <https://discuss.python.org/t/39233>`__
 Resolution: `10-Oct-2024 <https://discuss.python.org/t/39233/312>`__
 
+.. canonical-pypa-spec:: :ref:`packaging:dependency-groups`
+
 
 Abstract
 ========

peps/pep-0739.rst

@@ -115,6 +115,25 @@ below, which is rendered in an human-readable format here.
     * - Required
       - **True**
 
+``base_interpreter``
+--------------------
+
+.. list-table::
+    :widths: 25 75
+
+    * - Type
+      - ``string``
+    * - Description
+      - The path to the Python interprer of the base installation.
+        Either an absolute path, or a relative path to the path defined
+        in the ``base_prefix`` key.
+    * - Examples
+      - - ``/usr/bin/python``
+        - ``bin/python``
+        - etc.
+    * - Required
+      - **False**
+
 ``base_prefix``
 ---------------
 
@@ -376,42 +395,6 @@ below, which is rendered in an human-readable format here.
     * - Required
       - **True**
 
-``interpreter``
----------------
-
-.. list-table::
-    :widths: 25 75
-
-    * - Type
-      - ``object``
-    * - Description
-      - Object containing details Python interpreter.
-
-        This section MUST be present if the Python installation provides
-        an interpreter binary, otherwise this section will be missing.
-    * - Required
-      - **False**
-    * - Additional properties
-      - **Not allowed**
-
-``interpreter.path``
-~~~~~~~~~~~~~~~~~~~~
-
-.. list-table::
-    :widths: 25 75
-
-    * - Type
-      - ``string``
-    * - Description
-      - The path to the Python interprer. Either an absolute path, or a
-        relative path to the path defined in the ``base_prefix`` key.
-    * - Examples
-      - - ``/usr/bin/python``
-        - ``bin/python``
-        - etc.
-    * - Required
-      - **True**
-
 ``abi``
 -------
 
@@ -568,8 +551,10 @@ below, which is rendered in an human-readable format here.
         defined in the ``base_prefix`` key.
 
         This field MUST be present if the Python installation provides a
-        dynamic ``libpython`` library, otherwise this entry will be
-        missing.
+        dynamic ``libpython`` library targetting the Stable ABI,
+        otherwise this entry will be missing.
+
+        If this key is present ``dynamic`` MUST also be set.
     * - Examples
       - - ``/usr/lib/libpython3.so``
         - ``lib/libpython3.so``
@@ -600,8 +585,8 @@ below, which is rendered in an human-readable format here.
     * - Required
       - **False**
 
-``libpython.link_to_libpython``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``libpython.link_extensions``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. list-table::
     :widths: 25 75

peps/pep-0739/example.json

@@ -1,5 +1,6 @@
 {
   "schema_version": "1.0",
+  "base_interpreter": "/usr/bin/python",
   "base_prefix": "/usr",
   "platform": "linux-x86_64",
   "language": {
@@ -25,9 +26,6 @@
     "cache_tag": "cpython-314",
     "_multiarch": "x86_64-linux-gnu"
   },
-  "interpreter": {
-    "path": "/usr/bin/python"
-  },
   "abi": {
     "flags": ["t", "d"],
     "extension_suffix": ".cpython-314-x86_64-linux-gnu.so",
@@ -44,7 +42,7 @@
     "dynamic": "/usr/lib/libpython3.14.so.1.0",
     "dynamic_stableabi": "/usr/lib/libpython3.so",
     "static": "/usr/lib/python3.14/config-3.14-x86_64-linux-gnu/libpython3.14.a",
-    "link_to_libpython": true
+    "link_extensions": true
   },
   "c_api": {
     "headers": "/usr/include/python3.14",

peps/pep-0739/python-build-info-v1.0.schema.json

@@ -16,6 +16,14 @@
       "description": "Schema version.\n\nThis is a string following the format ``<MAJOR>.<MINOR>``, where ``<MAJOR>`` and ``<MINOR>`` are unpaded numbers and represent the **major** and **minor** components of the version. Versions may be arithmetic compared by intrepreting the version string as a decimal number.\n\nFor this specification version, this value is constant and MUST be ``1.0``.\n\nFuture versions of this schema MUST use a higher version number. Future versions of this schema MUST NOT use the same **major** version component as other schema version unless its specification is deemed backwards-compatible with them — it can't change, or extend, any parts of the current specification in such a way as the semantics of the interpreted data differ, or that data valid under the new specification is invalid under the older specification, with the exception of additional properties (errors caused by ``additionalProperties``).",
       "const": "1.0"
     },
+    "base_interpreter": {
+        "type": "string",
+        "description": "The path to the Python interprer of the base installation. Either an absolute path, or a relative path to the path defined in the ``base_prefix`` key.",
+        "examples": [
+          "/usr/bin/python",
+          "bin/python"
+        ]
+    },
     "base_prefix": {
       "type": "string",
       "description": "Base prefix of the Python installation.\n\nEither an absolute path, or a relative path to directory where this file is contained.",
@@ -137,24 +145,6 @@
         }
       }
     },
-    "interpreter": {
-      "type": "object",
-      "description": "Object containing details Python interpreter.\n\nThis section MUST be present if the Python installation provides an interpreter binary, otherwise this section will be missing.",
-      "required": [
-        "path"
-      ],
-      "additionalProperties": false,
-      "properties": {
-        "path": {
-          "type": "string",
-          "description": "The path to the Python interprer. Either an absolute path, or a relative path to the path defined in the ``base_prefix`` key.",
-          "examples": [
-            "/usr/bin/python",
-            "bin/python"
-          ]
-        }
-      }
-    },
     "abi": {
       "type": "object",
       "description": "Object containing details related to ABI.",
@@ -216,7 +206,7 @@
         },
         "dynamic_stableabi": {
           "type": "string",
-          "description": "The path to the dynamic ``libpython`` library for the stable ABI. Either an absolute path, or a relative path to the path defined in the ``base_prefix`` key.\n\nThis field MUST be present if the Python installation provides a dynamic ``libpython`` library, otherwise this entry will be missing.",
+          "description": "The path to the dynamic ``libpython`` library for the stable ABI. Either an absolute path, or a relative path to the path defined in the ``base_prefix`` key.\n\nThis field MUST be present if the Python installation provides a dynamic ``libpython`` library targetting the Stable ABI, otherwise this entry will be missing.\n\nIf this key is present ``dynamic`` MUST also be set.",
           "examples": [
             "/usr/lib/libpython3.so",
             "lib/libpython3.so"
@@ -230,7 +220,7 @@
             "lib/python3.14/config-3.14-x86_64-linux-gnu/libpython3.14.a"
           ]
         },
-        "link_to_libpython": {
+        "link_extensions": {
           "type": "boolean",
           "description": "Should extensions built against a dynamic ``libpython`` link to it?\n\nThis field MUST be present if the Python installation provides a dynamic ``libpython`` library, otherwise this entry will be missing."
         }

peps/pep-0745.rst

@@ -39,10 +39,10 @@ Actual:
 - 3.14.0 alpha 1: Tuesday, 2024-10-15
 - 3.14.0 alpha 2: Tuesday, 2024-11-19
 - 3.14.0 alpha 3: Tuesday, 2024-12-17
+- 3.14.0 alpha 4: Tuesday, 2025-01-14
 
 Expected:
 
-- 3.14.0 alpha 4: Tuesday, 2025-01-14
 - 3.14.0 alpha 5: Tuesday, 2025-02-11
 - 3.14.0 alpha 6: Friday, 2025-03-14
 - 3.14.0 alpha 7: Tuesday, 2025-04-08

peps/pep-0747.rst

@@ -243,10 +243,16 @@ be assignable to ``TypeForm``::
 
   v5: TypeForm[set[str]] = "set[str]"  # OK
 
+The typing spec defines syntactic rules for type expressions in the form of a
+:ref:`formal grammar <typing:expression-grammar>`. Semantic rules are specified
+as comments along with the grammar definition. Contextual requirements are detailed
+throughout the typing spec in sections that discuss concepts that appear within
+type expressions. For example, the special form ``Self`` can be used in a
+type expression only within a class, and a type variable can be used within
+a type expression only when it is associated with a valid scope.
+
 Expressions that violate one or more of the syntactic, semantic, or contextual
-rules for type expressions should not evaluate to a ``TypeForm`` type. The rules
-for type expression validity are explained in detail within the typing spec, so
-they are not repeated here::
+rules for type expressions should not evaluate to a ``TypeForm`` type.::
 
   bad1: TypeForm = tuple()  # Error: Call expression not allowed in type expression
   bad2: TypeForm = (1, 2)  # Error: Tuple expression not allowed in type expression
@@ -300,14 +306,6 @@ Assignability
   t1: TypeForm[int | str] = get_type_form()  # OK
   t2: TypeForm[str] = get_type_form()  # Error
 
-``type[T]`` is a subtype of ``TypeForm[T]``, which means that ``type[B]`` is
-assignable to ``TypeForm[A]`` if ``B`` is assignable to ``A``::
-
-  def get_type() -> type[int]: ...
-
-  t3: TypeForm[int | str] = get_type()  # OK
-  t4: TypeForm[str] = get_type()  # Error
-
 ``TypeForm`` is a subtype of ``object`` and is assumed to have all of the
 attributes and methods of ``object``.
 
@@ -532,6 +530,35 @@ of ``type``.
 .. _designed: https://mail.python.org/archives/list/[email protected]/message/D5FHORQVPHX3BHUDGF3A3TBZURBXLPHD/
 
 
+Treat ``type[T]`` as a subtype of ``TypeForm[T]``
+-------------------------------------------------
+
+It was suggested that type ``type[T]`` should be considered a subtype
+of ``TypeForm[T]``. This was ultimately rejected because there are ways to
+create an object of type ``type[T]`` that does not encode a valid type expression.
+For example, the expression ``type[1]`` is not a valid type expression. Likewise,
+the  expression ``type[S]`` is not a valid type expression if ``S`` is an
+out-of-scope type variable. This same argument applies to other special forms
+like objects of type ``UnionType``, which may or may not encode a valid type
+expression. Rather than carving out a special case for ``type[T]`` that would
+allow for potential unsoundness, it was decided to treat all type forms
+consistently. Therefore, ``type[T]`` is not considered a subtype of ``TypeForm[T]``.
+
+It was also pointed out that the expression ``C | C`` (where ``C`` is a class
+object) is a valid type expression - and therefore a valid ``TypeForm``,
+but its runtime type form encoding is an instance of ``UnionType`` and
+therefore is not compatible with ``type[C]``.
+
+If a function wishes to indicate that it accepts values of type ``TypeForm[T]``
+_and_ ``type[T]``, the parameter can simply be annotated with a union of these
+two types.
+
+::
+
+   def func[T](t: TypeForm[T] | type[T]) -> None: ...
+
+
+
 Accept arbitrary annotation expressions
 ---------------------------------------
 
@@ -547,7 +574,7 @@ not as a parameter type or a return type:
 
    def foo(not_reassignable: Final[object]): ...  # Error: Final not allowed here
 
-   def nonsense() -> Final[object]: ...  # Error: Final not alowed here
+   def nonsense() -> Final[object]: ...  # Error: Final not allowed here
 
 With the exception of ``Annotated``, type qualifiers are not allowed in type
 expressions. ``TypeForm`` is limited to type expressions because its