Merge branch 'main' into tidying

.github/CODEOWNERS

@@ -45,7 +45,7 @@ peps/pep-0012.rst  @brettcannon @warsaw
 peps/pep-0012/     @brettcannon
 # peps/pep-0013.rst is owned by the entire core team.
 # ...
-#peps/pep-0020.rst
+peps/pep-0020.rst  @tim-one
 # ...
 peps/pep-0042.rst  @jeremyhylton
 # ...
@@ -79,7 +79,7 @@ peps/pep-0218.rst  @rhettinger
 # peps/pep-0220.rst
 peps/pep-0221.rst  @Yhg1s
 # peps/pep-0222.rst
-# peps/pep-0223.rst
+peps/pep-0223.rst  @tim-one
 peps/pep-0224.rst  @malemburg
 # peps/pep-0225.rst
 peps/pep-0226.rst  @jeremyhylton
@@ -91,8 +91,8 @@ peps/pep-0231.rst  @warsaw
 peps/pep-0232.rst  @warsaw
 # peps/pep-0233.rst
 peps/pep-0234.rst  @gvanrossum
-# peps/pep-0235.rst
-# peps/pep-0236.rst
+peps/pep-0235.rst  @tim-one
+peps/pep-0236.rst  @tim-one
 peps/pep-0237.rst  @gvanrossum
 peps/pep-0238.rst  @gvanrossum
 # peps/pep-0239.rst
@@ -111,7 +111,7 @@ peps/pep-0251.rst  @warsaw @gvanrossum
 peps/pep-0252.rst  @gvanrossum
 peps/pep-0253.rst  @gvanrossum
 peps/pep-0254.rst  @gvanrossum
-peps/pep-0255.rst  @nascheme
+peps/pep-0255.rst  @nascheme @tim-one
 # peps/pep-0256.rst
 peps/pep-0257.rst  @gvanrossum
 # peps/pep-0258.rst
@@ -162,7 +162,7 @@ peps/pep-0302.rst  @pfmoore
 # peps/pep-0304.rst
 # peps/pep-0305.rst
 peps/pep-0306.rst  @jackdied @ncoghlan @benjaminp
-peps/pep-0307.rst  @gvanrossum
+peps/pep-0307.rst  @gvanrossum @tim-one
 peps/pep-0308.rst  @gvanrossum @rhettinger
 # peps/pep-0309.rst
 peps/pep-0310.rst  @pfmoore
@@ -354,17 +354,17 @@ peps/pep-0490.rst  @vstinner
 peps/pep-0492.rst  @1st1
 peps/pep-0493.rst  @ncoghlan @malemburg
 peps/pep-0494.rst  @ned-deily
-peps/pep-0495.rst  @abalkin
-peps/pep-0495-gap.png  @abalkin
-peps/pep-0495-gap.svg  @abalkin
-peps/pep-0495-fold.svg  @abalkin
-peps/pep-0495-fold-2.png  @abalkin
-peps/pep-0495-daylightsavings.png  @abalkin
+peps/pep-0495.rst  @abalkin @tim-one
+peps/pep-0495-gap.png  @abalkin @tim-one
+peps/pep-0495-gap.svg  @abalkin @tim-one
+peps/pep-0495-fold.svg  @abalkin @tim-one
+peps/pep-0495-fold-2.png  @abalkin @tim-one
+peps/pep-0495-daylightsavings.png  @abalkin @tim-one
 # peps/pep-0496.rst
 # peps/pep-0497.rst
 peps/pep-0498.rst  @ericvsmith
 # peps/pep-0499.rst
-peps/pep-0500.rst  @abalkin
+peps/pep-0500.rst  @abalkin @tim-one
 peps/pep-0501.rst  @ncoghlan
 # peps/pep-0502.rst
 peps/pep-0503.rst  @dstufft
@@ -442,7 +442,7 @@ peps/pep-0568.rst  @njsmith
 peps/pep-0569.rst  @ambv
 peps/pep-0570.rst  @larryhastings @pablogsal
 # peps/pep-0571.rst
-peps/pep-0572.rst  @gvanrossum
+peps/pep-0572.rst  @tim-one @gvanrossum
 peps/pep-0573.rst  @encukou @ncoghlan @ericsnowcurrently
 peps/pep-0574.rst  @pitrou
 # peps/pep-0575.rst
@@ -640,6 +640,7 @@ peps/pep-0759.rst  @warsaw
 peps/pep-0760.rst  @pablogsal @brettcannon
 peps/pep-0761.rst  @sethmlarson @hugovk
 peps/pep-0762.rst  @pablogsal @ambv @lysnikolaou @emilyemorehouse
+peps/pep-0763.rst  @dstufft
 # ...
 peps/pep-0777.rst  @warsaw
 # ...
@@ -718,7 +719,7 @@ peps/pep-3156.rst  @gvanrossum
 # peps/pep-3333.rst
 # ...
 peps/pep-8000.rst  @warsaw
-peps/pep-8001.rst  @brettcannon @tiran @dstufft @ericsnowcurrently @gpshead @ambv @Mariatta @njsmith @pablogsal @rhettinger @taleinat @zware
+peps/pep-8001.rst  @brettcannon @tiran @dstufft @ericsnowcurrently @gpshead @ambv @Mariatta @njsmith @pablogsal @rhettinger @taleinat @tim-one @zware
 peps/pep-8002.rst  @warsaw @ambv @pitrou @dhellmann @willingc
 peps/pep-8010.rst  @warsaw
 peps/pep-8011.rst  @Mariatta @warsaw

.github/workflows/lint.yml

@@ -20,16 +20,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-          cache: pip
 
       - name: Run pre-commit hooks
-        uses: pre-commit/action@v3.0.1
+        uses: tox-dev/action-pre-commit-uv@v1
 
       - name: Check spelling
-        uses: pre-commit/action@v3.0.1
+        uses: tox-dev/action-pre-commit-uv@v1
         with:
           extra_args: --all-files --hook-stage manual codespell || true

.github/workflows/test.yml

@@ -39,32 +39,27 @@ jobs:
         - "windows-latest"
         - "macos-latest"
         - "ubuntu-latest"
-        # Python 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
-        # https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
-        exclude:
-        - { python-version: "3.9", os: "macos-latest" }
-        include:
-        - { python-version: "3.9", os: "macos-13" }
-
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: pip
           allow-prereleases: true
 
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip
-          python -m pip install -U wheel
-          python -m pip install -U tox
+      - name: Install uv
+        uses: hynek/setup-cached-uv@v2
+        with:
+          cache-dependency-path: |
+            requirements.txt
 
-      - name: Run tests
+      - name: Run tests with tox
         run: |
-          tox -e py -- -v --cov-report term
+          uvx --with tox-uv tox -e py -- -v --cov-report term
 
       - name: Upload coverage
         uses: codecov/codecov-action@v4

Makefile

@@ -33,7 +33,7 @@ htmlview: html
 htmllive: SPHINXBUILD = PATH=$(VENVDIR)/bin:$$PATH sphinx-autobuild
 # Arbitrarily selected ephemeral port between 49152–65535
 # to avoid conflicts with other processes:
-htmllive: SPHINXERRORHANDLING = --re-ignore="/\.idea/|/venv/|/pep-0000.rst|/topic/" --open-browser --delay 0 --port 55302
+htmllive: SPHINXERRORHANDLING = --re-ignore="/\.idea/|/venv/|/numerical.rst|/pep-0000.rst|/topic/" --open-browser --delay 0 --port 55302
 htmllive: _ensure-sphinx-autobuild html
 
 ## dirhtml        to render PEPs to "index.html" files within "pep-NNNN" directories

peps/pep-0396.rst

@@ -1,12 +1,21 @@
 PEP: 396
 Title: Module Version Numbers
 Author: Barry Warsaw <barry@python.org>
-Status: Rejected
+Status: Withdrawn
 Type: Informational
 Topic: Packaging
 Created: 16-Mar-2011
 Post-History: 05-Apr-2011
 
+.. withdrawn::
+
+   Refer to :ref:`packaging:runtime-version-access` and
+   :ref:`packaging:single-source-version` in the Python
+   Packaging User Guide for up to date recommendations on
+   accessing package version information at runtime,
+   and on defining runtime ``__version__`` attributes which are
+   automatically kept consistent with package distribution metadata
+
 
 Abstract
 ========
@@ -22,14 +31,28 @@ Conformance with this PEP is optional, however other Python tools
 (such as ``distutils2`` [1]_) may be adapted to use the conventions
 defined here.
 
-PEP Rejection
-=============
+
+PEP Rejection/Withdrawal
+========================
 
 This PEP was formally rejected on 2021-04-14.  The packaging ecosystem
 has changed significantly in the intervening years since this PEP was
 first written, and APIs such as ``importlib.metadata.version()`` [11]_
 provide for a much better experience.
 
+This rejection was reclassified as a withdrawal on 2024-10-21,
+as the previous state was being misinterpreted [12]_ as suggesting
+that *no* modules should be defining ``__version__`` attributes,
+which definitely isn't the case.
+
+Modules are still free to define ``__version__`` if they choose to.
+However, choosing *not* to do so won't interfere with looking up
+the version information for installed distribution packages, so an
+Informational PEP isn't the right tool to document community
+conventions around the use of module ``__version__`` attributes
+(they're better covered as part of the Python Packaging User Guide).
+
+
 User Stories
 ============
 
@@ -284,6 +307,9 @@ References
 .. [11] importlib.metadata
    (https://docs.python.org/3/library/importlib.metadata.html#distribution-versions)
 
+.. [12] Misinterpreting the significance of this PEP's rejection
+   (https://discuss.python.org/t/please-make-package-version-go-away/58501)
+
 
 Copyright
 =========

peps/pep-0545.rst

@@ -3,8 +3,9 @@ Title: Python Documentation Translations
 Author: Julien Palard <julien@palard.fr>,
         Inada Naoki <songofacandy@gmail.com>,
         Victor Stinner <vstinner@python.org>
-Status: Final
+Status: Active
 Type: Process
+Topic: Governance
 Created: 04-Mar-2017
 Resolution: https://mail.python.org/pipermail/python-dev/2017-May/147957.html
 

peps/pep-0562.rst

@@ -9,6 +9,9 @@ Post-History: 09-Sep-2017
 Resolution: https://mail.python.org/pipermail/python-dev/2017-December/151033.html
 
 
+.. canonical-doc:: `Customizing Module Attribute Access <https://docs.python.org/3/reference/datamodel.html#customizing-module-attribute-access>`_
+
+
 Abstract
 ========
 

peps/pep-0588.rst

@@ -3,10 +3,14 @@ Title: GitHub Issues Migration Plan
 Author: Mariatta <mariatta@python.org>
 BDFL-Delegate: Barry Warsaw <barry@python.org>
 Discussions-To: https://discuss.python.org/t/13791
-Status: Draft
+Status: Final
 Type: Informational
 Created: 27-Mar-2019
 
+.. canonical-doc:: `psf/gh-migration#13 <https://github.com/psf/gh-migration/issues/13>`__
+
+   The migration was carried out in April 2022.
+
 
 Abstract
 ========
@@ -199,12 +203,12 @@ Mapping between issues from bpo and GitHub
 ------------------------------------------
 
 Usually when we reference an issue from bpo, we use bpo-XYZ but with
-Github, we will have a new reference with this format
+GitHub, we will have a new reference with this format
 ``https://github.com/python/cpython/issue/XYZ``.
 
 Because we will migrate the issues from bpo to GitHub, we need to have a new
 field on bpo for the reference to the issues on GitHub, and the same thing on
-Github for the 'eventual' reference from bpo.
+GitHub for the 'eventual' reference from bpo.
 
 For GitHub, we need to add ``origin: https://bugs.python.org/issueXYZ``.
 For bpo, add a new field ``moved to:

peps/pep-0659.rst

@@ -1,11 +1,13 @@
 PEP: 659
 Title: Specializing Adaptive Interpreter
 Author: Mark Shannon <mark@hotpy.org>
-Status: Draft
+Status: Final
 Type: Informational
 Created: 13-Apr-2021
 Post-History: 11-May-2021
 
+.. canonical-doc:: :ref:`Specializing Adaptive Interpreter <whatsnew311-pep659>`
+
 
 Abstract
 ========

peps/pep-0667.rst

@@ -3,12 +3,14 @@ Title: Consistent views of namespaces
 Author: Mark Shannon <mark@hotpy.org>,
         Tian Gao <gaogaotiantian@hotmail.com>
 Discussions-To: https://discuss.python.org/t/46631
-Status: Accepted
+Status: Final
 Type: Standards Track
 Created: 30-Jul-2021
 Python-Version: 3.13
 Post-History: 20-Aug-2021, 22-Feb-2024
-Resolution: https://discuss.python.org/t/pep-667-consistent-views-of-namespaces/46631/25
+Resolution:  `25-Apr-2024 <https://discuss.python.org/t/46631/25>`__
+
+.. canonical-doc:: :external+py3.13:func:`locals`
 
 Abstract
 ========

peps/pep-0691.rst

@@ -947,7 +947,7 @@ Appendix 2: Rough Underlying Data Models
 These are not intended to perfectly match the server, client, or wire
 formats. Rather, these are conceptual models, put to code to make them
 more explicit as to the abstract models underlining the repository API
-as it evolved through :pep:`503`, :pep:`529`, :pep:`629`, :pep:`658`,
+as it evolved through :pep:`503`, :pep:`592`, :pep:`629`, :pep:`658`,
 and now this PEP, :pep:`691`.
 
 The existing HTML, and the new JSON serialization of these models then
@@ -983,11 +983,11 @@ this PEP.
 
 
     @dataclass
-    class PEP529File(File):
+    class PEP592File(File):
         yanked: bool | str
 
     @dataclass
-    class PEP658File(PEP529File):
+    class PEP658File(PEP592File):
         # Limited to a len() of 1 in HTML
         dist_info_metadata: bool | dict[str, str]
 
@@ -1015,12 +1015,12 @@ this PEP.
 
 
     @dataclass
-    class PEP529_Detail(PEP503_Detail):
-        files: set[PEP529File]
+    class PEP592_Detail(PEP503_Detail):
+        files: set[PEP592File]
 
 
     @dataclass
-    class PEP629_Detail(PEP529_Detail):
+    class PEP629_Detail(PEP592_Detail):
         meta: Meta
 
 

peps/pep-0733.rst

@@ -28,7 +28,7 @@ Author: Erlend Egeberg Aasland <erlend@python.org>,
         William Woodruff <william@yossarian.net>,
         David Woods <dw-git@d-woods.co.uk>,
         Jelle Zijlstra <jelle.zijlstra@gmail.com>,
-Status: Draft
+Status: Final
 Type: Informational
 Created: 16-Oct-2023
 Post-History: `01-Nov-2023 <https://discuss.python.org/t/pep-733-an-evaluation-of-python-s-public-c-api/37618>`__