Merge branch 'main' into 794-import-namespace

brettcannon · web-flow · commit 91e7bda6dbff · 2025-07-15T08:40:59.000-07:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -655,6 +655,7 @@ peps/pep-0774.rst  @savannahostrowski
 peps/pep-0775.rst  @encukou
 peps/pep-0776.rst  @hoodmane @ambv
 peps/pep-0777.rst  @warsaw
+peps/pep-0778.rst  @warsaw
 # ...
 peps/pep-0779.rst  @Yhg1s @colesbury @mpage
 peps/pep-0780.rst  @lysnikolaou
diff --git a/peps/pep-0011.rst b/peps/pep-0011.rst
@@ -128,6 +128,7 @@ powerpc64le-unknown-linux-gnu    glibc, clang                Victor Stinner
 
                                  glibc, gcc                  Victor Stinner
 s390x-unknown-linux-gnu          glibc, gcc                  Victor Stinner
+wasm32-unknown-emscripten        emcc                        Russell Keith-Magee
 x86_64-linux-android                                         Russell Keith-Magee, Petr Viktorin
 x86_64-unknown-freebsd           BSD libc, clang             Victor Stinner
 ================================ =========================== ========
@@ -367,10 +368,6 @@ No-longer-supported platforms
   | Unsupported in:   Python 3.7
   | Code removed in:  Python 3.7
 
-* | Name:             wasm32-unknown-emscripten
-  | Unsupported in:   Python 3.13
-  | Code removed in:  Unknown
-
 
 Discussions
 ===========
diff --git a/peps/pep-0590.rst b/peps/pep-0590.rst
@@ -2,7 +2,7 @@ PEP: 590
 Title: Vectorcall: a fast calling protocol for CPython
 Author: Mark Shannon <mark@hotpy.org>, Jeroen Demeyer <J.Demeyer@UGent.be>
 BDFL-Delegate: Petr Viktorin <encukou@gmail.com>
-Status: Accepted
+Status: Final
 Type: Standards Track
 Created: 29-Mar-2019
 Python-Version: 3.8
diff --git a/peps/pep-0628.rst b/peps/pep-0628.rst
@@ -30,7 +30,7 @@ The idea in this PEP has been implemented in the auspiciously named
 `issue 12345`_.
 
 .. _accepted: https://bugs.python.org/issue12345#msg272287
-.. _issue 12345: http://bugs.python.org/issue12345
+.. _issue 12345: https://bugs.python.org/issue12345
 
 
 The Rationale for Tau
@@ -65,12 +65,12 @@ may be of interest:
   highlighting the problems with ``pi`` has `a page of resources`_ on the
   topic
 * For those that prefer videos to written text, `Pi is wrong!`_ and
-  `Pi is (still) wrong`_ are available on YouTube
+  `Pi is (still) wrong`_ are available.
 
-.. _Tau Manifesto: http://tauday.com/
-.. _Pi is (still) wrong: http://www.youtube.com/watch?v=jG7vhMMXagQ
-.. _Pi is wrong!: http://www.youtube.com/watch?v=IF1zcRoOVN0
-.. _a page of resources: http://www.math.utah.edu/~palais/pi.html
+.. _Tau Manifesto: https://tauday.com/
+.. _Pi is (still) wrong: https://vimeo.com/147792667
+.. _Pi is wrong!: https://www.youtube.com/watch?v=PIhNNnW1tUo
+.. _a page of resources: https://www.math.utah.edu/~palais/pi.html
 
 
 Copyright
diff --git a/peps/pep-0695.rst b/peps/pep-0695.rst
@@ -1201,7 +1201,7 @@ A default type argument can be specified using the ``=`` operator.
 .. code-block:: c++
 
     // Generic class
-    template <typename>
+    template <typename T>
     class ClassA
     {
         // Constraints are supported through compile-time assertions.
diff --git a/peps/pep-0710.rst b/peps/pep-0710.rst
@@ -446,6 +446,17 @@ contain any entries. In such cases, pip does not create any
 is encouraged for consumers to rebuild wheels with a newer version of pip in
 these cases.
 
+uv developers `raised a concern about requiring at least one hash
+<https://discuss.python.org/t/25428/34>`__ in the ``provenance_url.json`` file
+as uv does not calculate distribution hashes unless explicitly required.
+However, requiring at least one hash aids in integrity checks for
+distributions. This is important in scenarios involving lock files or when
+identifying distributions as part of SBOMs. The ``provenance_url.json`` file
+mandates the inclusion of at least one hash for the downloaded distribution.
+Installers that do not compute hashes of distributions as part of the
+installation process (e.g., due to performance reasons) can omit creating the
+``provenance_url.json`` file.
+
 Making the hashes key optional
 ------------------------------
 
@@ -670,10 +681,10 @@ which this idea originated.
 Thanks to Donald Stufft, Ofek Lev, and Trishank Kuppusamy for early feedback
 and support to work on this PEP.
 
-Thanks to Gregory P. Smith, Stéphane Bidoul, and C.A.M. Gerlach for
-reviewing this PEP and providing valuable suggestions.
+Thanks to Gregory P. Smith, Stéphane Bidoul, C.A.M. Gerlach, and Adam Turner
+for reviewing this PEP and providing valuable suggestions.
 
-Thanks to Seth Michael Larson for providing valuable suggestions and for
+Thanks to Seth Michael Larson for support, providing valuable suggestions and for
 the proposed pip-sbom prototype.
 
 Thanks to Stéphane Bidoul and Chris Jerdonek for :pep:`610`, and related
@@ -684,6 +695,8 @@ Thanks to Stéphane Bidoul and Chris Jerdonek for :pep:`610`, and related
 Thanks to Frost Ming for raising possible concern around storing index URL in
 the ``provenance_url.json`` file and initial PEP 710 support in PDM.
 
+Thanks to Charlie Marsh and Zanie Blue for inputs related to the uv installer.
+
 Last, but not least, thanks to Donald Stufft for sponsoring this PEP.
 
 Copyright
diff --git a/peps/pep-0722.rst b/peps/pep-0722.rst
@@ -8,7 +8,10 @@ Type: Standards Track
 Topic: Packaging
 Created: 19-Jul-2023
 Post-History: `19-Jul-2023 <https://discuss.python.org/t/29905>`__
-Resolution: https://discuss.python.org/t/pep-722-723-decision/36763/
+Superseded-By: 723
+Resolution: `21-Oct-2023 <https://discuss.python.org/t/pep-722-723-decision/36763/>`__
+
+.. rejected:: This PEP was rejected in favour of :pep:`723`.
 
 
 Abstract
diff --git a/peps/pep-0728.rst b/peps/pep-0728.rst
@@ -215,7 +215,7 @@ the ``extra_items`` argument::
 
 ``extra_items`` is inherited through subclassing::
 
-    class MovieBase(TypedDict, extra_items=int | None):
+    class MovieBase(TypedDict, extra_items=ReadOnly[int | None]):
         name: str
 
     class Movie(MovieBase):
@@ -380,6 +380,7 @@ unless it is declared to be ``ReadOnly`` in the superclass::
         pass
 
     class Child(Parent, extra_items=int): # Not OK. Like any other TypedDict item, extra_items's type cannot be changed
+        pass
 
 Second, ``extra_items=T`` effectively defines the value type of any unnamed
 items accepted to the TypedDict and marks them as non-required. Thus, the above
diff --git a/peps/pep-0734.rst b/peps/pep-0734.rst
@@ -2,14 +2,15 @@ PEP: 734
 Title: Multiple Interpreters in the Stdlib
 Author: Eric Snow <ericsnowcurrently@gmail.com>
 Discussions-To: https://discuss.python.org/t/pep-734-multiple-interpreters-in-the-stdlib/41147
-Status: Accepted
+Status: Final
 Type: Standards Track
 Created: 06-Nov-2023
 Python-Version: 3.14
 Post-History: `14-Dec-2023 <https://discuss.python.org/t/pep-734-multiple-interpreters-in-the-stdlib/41147/>`__,
 Replaces: 554
 Resolution: `05-Jun-2025 <https://discuss.python.org/t/41147/36>`__
 
+.. canonical-doc:: :mod:`concurrent.interpreters`
 
 .. note::
    This PEP is essentially a continuation of :pep:`554`.  That document
@@ -20,7 +21,7 @@ Resolution: `05-Jun-2025 <https://discuss.python.org/t/41147/36>`__
 
 .. note::
    This PEP was accepted with the provision that the name change
-   to :py:mod:`!concurrent.interpreters`.
+   to :mod:`concurrent.interpreters`.
 
 
 Abstract
diff --git a/peps/pep-0745.rst b/peps/pep-0745.rst
@@ -47,10 +47,10 @@ Actual:
   (No new features beyond this point.)
 - 3.14.0 beta 2: Monday, 2025-05-26
 - 3.14.0 beta 3: Tuesday, 2025-06-17
+- 3.14.0 beta 4: Tuesday, 2025-07-08
 
 Expected:
 
-- 3.14.0 beta 4: Tuesday, 2025-07-08
 - 3.14.0 candidate 1: Tuesday, 2025-07-22
 - 3.14.0 candidate 2: Tuesday, 2025-08-26
 - 3.14.0 final: Tuesday, 2025-10-07
diff --git a/peps/pep-0750.rst b/peps/pep-0750.rst
@@ -394,37 +394,44 @@ Template String Concatenation
 -----------------------------
 
 Template strings support explicit concatenation using ``+``. Concatenation is
-supported for two ``Template`` instances as well as for a ``Template`` instance
-and a ``str``:
+supported for two ``Template`` instances via ``Template.__add__()``:
 
 .. code-block:: python
 
     name = "World"
-    template = t"{name}"
 
-    assert isinstance(t"Hello " + template, Template)
-    assert (t"Hello " + template).strings == ("Hello ", "")
-    assert (t"Hello " + template).interpolations[0].value == "World"
+    assert isinstance(t"Hello " + t"{name}", Template)
+    assert (t"Hello " + t"{name}").strings == ("Hello ", "")
+    assert (t"Hello " + t"{name}").values[0] == "World"
 
-    assert isinstance("Hello " + template, Template)
-    assert ("Hello " + template).strings == ("Hello ", "")
-    assert ("Hello " + template).interpolations[0].value == "World"
+Implicit concatenation of two template string literals is also supported:
 
-Concatenation of templates is "viral": the concatenation of a ``Template`` and
-a ``str`` always results in a ``Template`` instance.
+.. code-block:: python
+
+    name = "World"
+    assert isinstance(t"Hello " t"{name}", Template)
+    assert (t"Hello " t"{name}").strings == ("Hello ", "")
+    assert (t"Hello " t"{name}").values[0] == "World"
+
+Both implicit and explicit concatenation of ``Template`` and ``str`` is
+prohibited. This is because it is ambiguous whether the ``str`` should be
+treated as a static string part or as an interpolation.
 
-Python's implicit concatenation syntax is also supported. The following code
-will work as expected:
+To combine a ``Template`` and a ``str``, developers must explicitly decide how
+to treat the ``str``. If the ``str`` is intended to be a static string part,
+it should be wrapped in a ``Template``. If the ``str`` is intended to be an
+interpolation value, it should be wrapped in an ``Interpolation`` and
+passed to the ``Template`` constructor. For example:
 
 .. code-block:: python
 
     name = "World"
-    assert (t"Hello " t"World").strings == ("Hello World",)
-    assert ("Hello " t"World").strings == ("Hello World",)
 
-The ``Template`` type supports the ``__add__()`` and ``__radd__()`` methods
-between two ``Template`` instances and between a ``Template`` instance and a
-``str``.
+    # Treat `name` as a static string part
+    template = t"Hello " + Template(name)
+
+    # Treat `name` as an interpolation
+    template = t"Hello " + Template(Interpolation(name, "name"))
 
 
 Template and Interpolation Equality
@@ -1349,11 +1356,12 @@ Developers who need to obtain the original template string literal can always
 use ``inspect.getsource()`` or similar tools.
 
 
-Disallowing String Concatenation
---------------------------------
+Disallowing Template Concatenation
+----------------------------------
 
-Earlier versions of this PEP proposed that template strings should not support
-concatenation. This was rejected in favor of allowing concatenation.
+Earlier versions of this PEP proposed that ``Template`` instances should not
+support concatenation. This was rejected in favor of allowing concatenating
+multiple ``Template`` instances.
 
 There are reasonable arguments in favor of rejecting one or all forms of
 concatenation: namely, that it cuts off a class of potential bugs, particularly
@@ -1367,13 +1375,16 @@ return a type that supported concatenation.
 
 In the end, we decided that the surprise to developers of a new string type
 *not* supporting concatenation was likely to be greater than the theoretical
-harm caused by supporting it. (Developers concatenate f-strings all the time,
-after all, and while we are sure there are cases where this introduces bugs,
-it's not clear that those bugs outweigh the benefits of supporting concatenation.)
+harm caused by supporting it.
+
+While concatenation of two ``Templates`` is supported by this PEP, concatenation
+of a ``Template`` and a ``str`` is not supported. This is because it is
+ambiguous whether  ``str`` should be treated as a static string or an
+interpolation. Developers must wrap the ``str`` in a ``Template`` instance
+before concatenating it with another ``Template``, as described above.
 
-While concatenation is supported, we expect that code that uses template strings
-will more commonly build up larger templates through nesting and composition
-rather than concatenation.
+We expect that code that uses template strings will more commonly build up
+larger templates through nesting and composition rather than concatenation.
 
 
 Arbitrary Conversion Values
diff --git a/peps/pep-0768.rst b/peps/pep-0768.rst
@@ -135,9 +135,9 @@ A new structure is added to PyThreadState to support remote debugging:
 
 .. code-block:: C
 
-    typedef struct _remote_debugger_support {
+    typedef struct {
         int debugger_pending_call;
-        char debugger_script_path[MAX_SCRIPT_PATH_SIZE];
+        char debugger_script_path[Py_MAX_SCRIPT_PATH_SIZE];
     } _PyRemoteDebuggerSupport;
 
 This structure is appended to ``PyThreadState``, adding only a few fields that
@@ -147,7 +147,7 @@ provides a filesystem path to a Python source file (.py) that will be executed w
 the interpreter reaches a safe point. The path must point to a Python source file,
 not compiled Python code (.pyc) or any other format.
 
-The value for ``MAX_SCRIPT_PATH_SIZE`` will be a trade-off between binary size
+The value for ``Py_MAX_SCRIPT_PATH_SIZE`` will be a trade-off between binary size
 and how big debugging scripts' paths can be. To limit the memory overhead per
 thread we will be limiting this to 512 bytes. This size will also be provided as
 part of the debugger support structure so debuggers know how much they can
diff --git a/peps/pep-0778.rst b/peps/pep-0778.rst
diff --git a/peps/pep-0782.rst b/peps/pep-0782.rst
diff --git a/peps/pep-0788.rst b/peps/pep-0788.rst
diff --git a/peps/pep-0792.rst b/peps/pep-0792.rst

Original file line number	Diff line number	Diff line change
@@ -1201,7 +1201,7 @@ A default type argument can be specified using the ``=`` operator.
`1201`	`1201`	`.. code-block:: c++`
`1202`	`1202`
`1203`	`1203`	`// Generic class`
`1204`		`- template <typename>`
	`1204`	`+ template <typename T>`
`1205`	`1205`	`class ClassA`
`1206`	`1206`	`{`
`1207`	`1207`	`// Constraints are supported through compile-time assertions.`