Skip to content

Commit 53b8f38

Browse files
authored
Merge branch 'main' into tidying
2 parents b4cc900 + 1d10fc5 commit 53b8f38

21 files changed

+1364
-608
lines changed

.github/CODEOWNERS

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ peps/pep-0012.rst @brettcannon @warsaw
4545
peps/pep-0012/ @brettcannon
4646
# peps/pep-0013.rst is owned by the entire core team.
4747
# ...
48-
#peps/pep-0020.rst
48+
peps/pep-0020.rst @tim-one
4949
# ...
5050
peps/pep-0042.rst @jeremyhylton
5151
# ...
@@ -79,7 +79,7 @@ peps/pep-0218.rst @rhettinger
7979
# peps/pep-0220.rst
8080
peps/pep-0221.rst @Yhg1s
8181
# peps/pep-0222.rst
82-
# peps/pep-0223.rst
82+
peps/pep-0223.rst @tim-one
8383
peps/pep-0224.rst @malemburg
8484
# peps/pep-0225.rst
8585
peps/pep-0226.rst @jeremyhylton
@@ -91,8 +91,8 @@ peps/pep-0231.rst @warsaw
9191
peps/pep-0232.rst @warsaw
9292
# peps/pep-0233.rst
9393
peps/pep-0234.rst @gvanrossum
94-
# peps/pep-0235.rst
95-
# peps/pep-0236.rst
94+
peps/pep-0235.rst @tim-one
95+
peps/pep-0236.rst @tim-one
9696
peps/pep-0237.rst @gvanrossum
9797
peps/pep-0238.rst @gvanrossum
9898
# peps/pep-0239.rst
@@ -111,7 +111,7 @@ peps/pep-0251.rst @warsaw @gvanrossum
111111
peps/pep-0252.rst @gvanrossum
112112
peps/pep-0253.rst @gvanrossum
113113
peps/pep-0254.rst @gvanrossum
114-
peps/pep-0255.rst @nascheme
114+
peps/pep-0255.rst @nascheme @tim-one
115115
# peps/pep-0256.rst
116116
peps/pep-0257.rst @gvanrossum
117117
# peps/pep-0258.rst
@@ -162,7 +162,7 @@ peps/pep-0302.rst @pfmoore
162162
# peps/pep-0304.rst
163163
# peps/pep-0305.rst
164164
peps/pep-0306.rst @jackdied @ncoghlan @benjaminp
165-
peps/pep-0307.rst @gvanrossum
165+
peps/pep-0307.rst @gvanrossum @tim-one
166166
peps/pep-0308.rst @gvanrossum @rhettinger
167167
# peps/pep-0309.rst
168168
peps/pep-0310.rst @pfmoore
@@ -354,17 +354,17 @@ peps/pep-0490.rst @vstinner
354354
peps/pep-0492.rst @1st1
355355
peps/pep-0493.rst @ncoghlan @malemburg
356356
peps/pep-0494.rst @ned-deily
357-
peps/pep-0495.rst @abalkin
358-
peps/pep-0495-gap.png @abalkin
359-
peps/pep-0495-gap.svg @abalkin
360-
peps/pep-0495-fold.svg @abalkin
361-
peps/pep-0495-fold-2.png @abalkin
362-
peps/pep-0495-daylightsavings.png @abalkin
357+
peps/pep-0495.rst @abalkin @tim-one
358+
peps/pep-0495-gap.png @abalkin @tim-one
359+
peps/pep-0495-gap.svg @abalkin @tim-one
360+
peps/pep-0495-fold.svg @abalkin @tim-one
361+
peps/pep-0495-fold-2.png @abalkin @tim-one
362+
peps/pep-0495-daylightsavings.png @abalkin @tim-one
363363
# peps/pep-0496.rst
364364
# peps/pep-0497.rst
365365
peps/pep-0498.rst @ericvsmith
366366
# peps/pep-0499.rst
367-
peps/pep-0500.rst @abalkin
367+
peps/pep-0500.rst @abalkin @tim-one
368368
peps/pep-0501.rst @ncoghlan
369369
# peps/pep-0502.rst
370370
peps/pep-0503.rst @dstufft
@@ -442,7 +442,7 @@ peps/pep-0568.rst @njsmith
442442
peps/pep-0569.rst @ambv
443443
peps/pep-0570.rst @larryhastings @pablogsal
444444
# peps/pep-0571.rst
445-
peps/pep-0572.rst @gvanrossum
445+
peps/pep-0572.rst @tim-one @gvanrossum
446446
peps/pep-0573.rst @encukou @ncoghlan @ericsnowcurrently
447447
peps/pep-0574.rst @pitrou
448448
# peps/pep-0575.rst
@@ -640,6 +640,7 @@ peps/pep-0759.rst @warsaw
640640
peps/pep-0760.rst @pablogsal @brettcannon
641641
peps/pep-0761.rst @sethmlarson @hugovk
642642
peps/pep-0762.rst @pablogsal @ambv @lysnikolaou @emilyemorehouse
643+
peps/pep-0763.rst @dstufft
643644
# ...
644645
peps/pep-0777.rst @warsaw
645646
# ...
@@ -718,7 +719,7 @@ peps/pep-3156.rst @gvanrossum
718719
# peps/pep-3333.rst
719720
# ...
720721
peps/pep-8000.rst @warsaw
721-
peps/pep-8001.rst @brettcannon @tiran @dstufft @ericsnowcurrently @gpshead @ambv @Mariatta @njsmith @pablogsal @rhettinger @taleinat @zware
722+
peps/pep-8001.rst @brettcannon @tiran @dstufft @ericsnowcurrently @gpshead @ambv @Mariatta @njsmith @pablogsal @rhettinger @taleinat @tim-one @zware
722723
peps/pep-8002.rst @warsaw @ambv @pitrou @dhellmann @willingc
723724
peps/pep-8010.rst @warsaw
724725
peps/pep-8011.rst @Mariatta @warsaw

.github/workflows/lint.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v4
23+
with:
24+
persist-credentials: false
25+
2326
- name: Set up Python 3
2427
uses: actions/setup-python@v5
2528
with:
2629
python-version: "3.x"
27-
cache: pip
2830

2931
- name: Run pre-commit hooks
30-
uses: pre-commit/action@v3.0.1
32+
uses: tox-dev/action-pre-commit-uv@v1
3133

3234
- name: Check spelling
33-
uses: pre-commit/action@v3.0.1
35+
uses: tox-dev/action-pre-commit-uv@v1
3436
with:
3537
extra_args: --all-files --hook-stage manual codespell || true

.github/workflows/test.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,27 @@ jobs:
3939
- "windows-latest"
4040
- "macos-latest"
4141
- "ubuntu-latest"
42-
# Python 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
43-
# https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
44-
exclude:
45-
- { python-version: "3.9", os: "macos-latest" }
46-
include:
47-
- { python-version: "3.9", os: "macos-13" }
48-
4942

5043
steps:
5144
- uses: actions/checkout@v4
45+
with:
46+
persist-credentials: false
47+
5248
- name: Set up Python ${{ matrix.python-version }}
5349
uses: actions/setup-python@v5
5450
with:
5551
python-version: ${{ matrix.python-version }}
56-
cache: pip
5752
allow-prereleases: true
5853

59-
- name: Install dependencies
60-
run: |
61-
python -m pip install -U pip
62-
python -m pip install -U wheel
63-
python -m pip install -U tox
54+
- name: Install uv
55+
uses: hynek/setup-cached-uv@v2
56+
with:
57+
cache-dependency-path: |
58+
requirements.txt
6459
65-
- name: Run tests
60+
- name: Run tests with tox
6661
run: |
67-
tox -e py -- -v --cov-report term
62+
uvx --with tox-uv tox -e py -- -v --cov-report term
6863
6964
- name: Upload coverage
7065
uses: codecov/codecov-action@v4

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ htmlview: html
3333
htmllive: SPHINXBUILD = PATH=$(VENVDIR)/bin:$$PATH sphinx-autobuild
3434
# Arbitrarily selected ephemeral port between 49152–65535
3535
# to avoid conflicts with other processes:
36-
htmllive: SPHINXERRORHANDLING = --re-ignore="/\.idea/|/venv/|/pep-0000.rst|/topic/" --open-browser --delay 0 --port 55302
36+
htmllive: SPHINXERRORHANDLING = --re-ignore="/\.idea/|/venv/|/numerical.rst|/pep-0000.rst|/topic/" --open-browser --delay 0 --port 55302
3737
htmllive: _ensure-sphinx-autobuild html
3838

3939
## dirhtml to render PEPs to "index.html" files within "pep-NNNN" directories

peps/pep-0396.rst

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
PEP: 396
22
Title: Module Version Numbers
33
Author: Barry Warsaw <barry@python.org>
4-
Status: Rejected
4+
Status: Withdrawn
55
Type: Informational
66
Topic: Packaging
77
Created: 16-Mar-2011
88
Post-History: 05-Apr-2011
99

10+
.. withdrawn::
11+
12+
Refer to :ref:`packaging:runtime-version-access` and
13+
:ref:`packaging:single-source-version` in the Python
14+
Packaging User Guide for up to date recommendations on
15+
accessing package version information at runtime,
16+
and on defining runtime ``__version__`` attributes which are
17+
automatically kept consistent with package distribution metadata
18+
1019

1120
Abstract
1221
========
@@ -22,14 +31,28 @@ Conformance with this PEP is optional, however other Python tools
2231
(such as ``distutils2`` [1]_) may be adapted to use the conventions
2332
defined here.
2433

25-
PEP Rejection
26-
=============
34+
35+
PEP Rejection/Withdrawal
36+
========================
2737

2838
This PEP was formally rejected on 2021-04-14. The packaging ecosystem
2939
has changed significantly in the intervening years since this PEP was
3040
first written, and APIs such as ``importlib.metadata.version()`` [11]_
3141
provide for a much better experience.
3242

43+
This rejection was reclassified as a withdrawal on 2024-10-21,
44+
as the previous state was being misinterpreted [12]_ as suggesting
45+
that *no* modules should be defining ``__version__`` attributes,
46+
which definitely isn't the case.
47+
48+
Modules are still free to define ``__version__`` if they choose to.
49+
However, choosing *not* to do so won't interfere with looking up
50+
the version information for installed distribution packages, so an
51+
Informational PEP isn't the right tool to document community
52+
conventions around the use of module ``__version__`` attributes
53+
(they're better covered as part of the Python Packaging User Guide).
54+
55+
3356
User Stories
3457
============
3558

@@ -284,6 +307,9 @@ References
284307
.. [11] importlib.metadata
285308
(https://docs.python.org/3/library/importlib.metadata.html#distribution-versions)
286309
310+
.. [12] Misinterpreting the significance of this PEP's rejection
311+
(https://discuss.python.org/t/please-make-package-version-go-away/58501)
312+
287313
288314
Copyright
289315
=========

peps/pep-0545.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ Title: Python Documentation Translations
33
Author: Julien Palard <julien@palard.fr>,
44
Inada Naoki <songofacandy@gmail.com>,
55
Victor Stinner <vstinner@python.org>
6-
Status: Final
6+
Status: Active
77
Type: Process
8+
Topic: Governance
89
Created: 04-Mar-2017
910
Resolution: https://mail.python.org/pipermail/python-dev/2017-May/147957.html
1011

peps/pep-0562.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Post-History: 09-Sep-2017
99
Resolution: https://mail.python.org/pipermail/python-dev/2017-December/151033.html
1010

1111

12+
.. canonical-doc:: `Customizing Module Attribute Access <https://docs.python.org/3/reference/datamodel.html#customizing-module-attribute-access>`_
13+
14+
1215
Abstract
1316
========
1417

peps/pep-0588.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ Title: GitHub Issues Migration Plan
33
Author: Mariatta <mariatta@python.org>
44
BDFL-Delegate: Barry Warsaw <barry@python.org>
55
Discussions-To: https://discuss.python.org/t/13791
6-
Status: Draft
6+
Status: Final
77
Type: Informational
88
Created: 27-Mar-2019
99

10+
.. canonical-doc:: `psf/gh-migration#13 <https://github.com/psf/gh-migration/issues/13>`__
11+
12+
The migration was carried out in April 2022.
13+
1014

1115
Abstract
1216
========
@@ -199,12 +203,12 @@ Mapping between issues from bpo and GitHub
199203
------------------------------------------
200204

201205
Usually when we reference an issue from bpo, we use bpo-XYZ but with
202-
Github, we will have a new reference with this format
206+
GitHub, we will have a new reference with this format
203207
``https://github.com/python/cpython/issue/XYZ``.
204208

205209
Because we will migrate the issues from bpo to GitHub, we need to have a new
206210
field on bpo for the reference to the issues on GitHub, and the same thing on
207-
Github for the 'eventual' reference from bpo.
211+
GitHub for the 'eventual' reference from bpo.
208212

209213
For GitHub, we need to add ``origin: https://bugs.python.org/issueXYZ``.
210214
For bpo, add a new field ``moved to:

peps/pep-0659.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
PEP: 659
22
Title: Specializing Adaptive Interpreter
33
Author: Mark Shannon <mark@hotpy.org>
4-
Status: Draft
4+
Status: Final
55
Type: Informational
66
Created: 13-Apr-2021
77
Post-History: 11-May-2021
88

9+
.. canonical-doc:: :ref:`Specializing Adaptive Interpreter <whatsnew311-pep659>`
10+
911

1012
Abstract
1113
========

peps/pep-0667.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ Title: Consistent views of namespaces
33
Author: Mark Shannon <mark@hotpy.org>,
44
Tian Gao <gaogaotiantian@hotmail.com>
55
Discussions-To: https://discuss.python.org/t/46631
6-
Status: Accepted
6+
Status: Final
77
Type: Standards Track
88
Created: 30-Jul-2021
99
Python-Version: 3.13
1010
Post-History: 20-Aug-2021, 22-Feb-2024
11-
Resolution: https://discuss.python.org/t/pep-667-consistent-views-of-namespaces/46631/25
11+
Resolution: `25-Apr-2024 <https://discuss.python.org/t/46631/25>`__
12+
13+
.. canonical-doc:: :external+py3.13:func:`locals`
1214

1315
Abstract
1416
========

0 commit comments

Comments
 (0)