Skip to content

Commit 145e674

Browse files
authored
Merge branch 'main' into tidying
2 parents 53b8f38 + 1e7852c commit 145e674

21 files changed

+1242
-71
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,8 @@ peps/pep-0760.rst @pablogsal @brettcannon
641641
peps/pep-0761.rst @sethmlarson @hugovk
642642
peps/pep-0762.rst @pablogsal @ambv @lysnikolaou @emilyemorehouse
643643
peps/pep-0763.rst @dstufft
644+
peps/pep-0765.rst @iritkatriel @ncoghlan
645+
peps/pep-0766.rst @warsaw
644646
# ...
645647
peps/pep-0777.rst @warsaw
646648
# ...

peps/pep-0011.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Target Triple Notes Contacts
103103
aarch64-unknown-linux-gnu glibc, gcc Petr Viktorin, Victor Stinner
104104

105105
glibc, clang Victor Stinner, Gregory P. Smith
106-
wasm32-unknown-wasi WASI SDK, Wasmtime Brett Cannon, Eric Snow
106+
wasm32-unknown-wasip1 WASI SDK, Wasmtime Brett Cannon, Eric Snow
107107
x86_64-unknown-linux-gnu glibc, clang Victor Stinner, Gregory P. Smith
108108
============================= ========================== ========
109109

peps/pep-0012/pep-NNNN.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PEP: <REQUIRED: pep number>
22
Title: <REQUIRED: pep title>
3-
Author: <REQUIRED: list of authors' real names and optionally, email addrs>
4-
Sponsor: <real name of sponsor>
5-
PEP-Delegate: <PEP delegate's real name>
3+
Author: <REQUIRED: list of authors' names and optionally, email addrs>
4+
Sponsor: <name of sponsor>
5+
PEP-Delegate: <PEP delegate's name>
66
Discussions-To: <REQUIRED: URL of current canonical discussion thread>
77
Status: <REQUIRED: Draft | Active | Accepted | Provisional | Deferred | Rejected | Withdrawn | Final | Superseded>
88
Type: <REQUIRED: Standards Track | Informational | Process>

peps/pep-0101.rst

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@ Here's a hopefully-complete list.
3333

3434
* A GPG key.
3535

36-
Python releases are digitally signed with GPG; you'll need a key,
37-
which hopefully will be on the "web of trust" with at least one of
36+
Python releases before 3.14 are digitally signed with GPG; for these you'll
37+
need a key, which hopefully will be on the "web of trust" with at least one of
3838
the other release managers.
3939

40+
.. note:: GPG instructions in this PEP can be ignored for Python 3.14 and
41+
later. See :pep:`761` for details.
42+
4043
* A bunch of software:
4144

4245
* A checkout of the `python/release-tools`_ repo.
@@ -263,20 +266,6 @@ to perform some manual editing steps.
263266
- Make sure all changes have been committed. (``release.py --bump``
264267
doesn't check in its changes for you.)
265268

266-
- Check the years on the copyright notice. If the last release
267-
was some time last year, add the current year to the copyright
268-
notice in several places:
269-
270-
- ``README``
271-
- ``LICENSE`` (make sure to change on ``main`` and the branch)
272-
- ``Python/getcopyright.c``
273-
- ``Doc/copyright.rst``
274-
- ``Doc/license.rst``
275-
- ``PC/python_ver_rc.h`` sets up the DLL version resource for Windows
276-
(displayed when you right-click on the DLL and select
277-
Properties). This isn't a C include file, it's a Windows
278-
"resource file" include file.
279-
280269
- For a **final** major release, edit the first paragraph of
281270
``Doc/whatsnew/3.X.rst`` to include the actual release date; e.g. "Python
282271
2.5 was released on August 1, 2003." There's no need to edit this for
@@ -610,7 +599,7 @@ the main repo.
610599
release branch (3.X-1) and use them as a template.
611600
https://github.com/python/cpython/settings/branches
612601

613-
Also, add a ``needs backport to 3.X`` label to the GitHub repo.
602+
Also, add ``3.x`` and ``needs backport to 3.X`` labels to the GitHub repo.
614603
https://github.com/python/cpython/labels
615604

616605
- You can now re-enable enforcement of branch settings against administrators
@@ -637,7 +626,7 @@ permissions.
637626
Python release "page", editing as you go.
638627

639628
You can use `Markdown <https://daringfireball.net/projects/markdown/syntax>`_ or
640-
`reStructured Text <http://docutils.sourceforge.net/docs/user/rst/quickref.html>`_
629+
`reStructured Text <https://docutils.sourceforge.io/docs/user/rst/quickref.html>`_
641630
to describe your release. The former is less verbose, while the latter has nifty
642631
integration for things like referencing PEPs.
643632

@@ -742,28 +731,20 @@ permissions.
742731

743732
* python-list@python.org
744733
* python-announce@python.org
745-
* python-dev@python.org
746734

747735
- Also post the announcement to the
748-
`Python Insider blog <http://blog.python.org>`_.
736+
`Python Insider blog <https://blog.python.org>`_.
749737
To add a new entry, go to
750-
`your Blogger home page, here <https://www.blogger.com/home>`_.
738+
`your Blogger home page <https://www.blogger.com/home>`_.
751739

752-
- Update any release PEPs (e.g. 719) with the release dates.
740+
- Update `release PEPs <https://peps.python.org/topic/release/>`__
741+
(e.g. 719) with the release dates.
753742

754743
- Update the labels on https://github.com/python/cpython/issues:
755744

756745
- Flip all the `deferred-blocker`_ issues back to `release-blocker`_
757746
for the next release.
758747

759-
- Add version ``3.X+1`` as when version ``3.X`` enters alpha.
760-
761-
- Change non-doc feature requests to version ``3.X+1`` when version ``3.X``
762-
enters beta.
763-
764-
- Update issues from versions that your release makes
765-
unsupported to the next supported version.
766-
767748
- Review open issues, as this might find lurking showstopper bugs,
768749
besides reminding people to fix the easy ones they forgot about.
769750

@@ -788,7 +769,7 @@ permissions.
788769
or Zach Ware).
789770

790771
- Ensure the various GitHub bots are updated, as needed, for the
791-
new branch, in particular, make sure backporting to the new
772+
new branch. In particular, make sure backporting to the new
792773
branch works (contact the `core-workflow team
793774
<https://github.com/python/core-workflow/issues>`__).
794775

@@ -801,7 +782,7 @@ permissions.
801782
branches and that the release branch is properly protected (no direct
802783
pushes, etc).
803784

804-
- Verify that the `on-line docs <https://docs.python.org/>`__ are building
785+
- Verify that the `online docs <https://docs.python.org/>`__ are building
805786
properly (this may take up to 24 hours for a complete build on the website).
806787

807788

@@ -869,12 +850,16 @@ else does them. Some of those tasks include:
869850

870851
- Retire the release from the `issue tracker`_. Tasks include:
871852

853+
* update issues from this version to the next supported version
854+
872855
* remove version label from list of versions
873856

874857
* remove the ``needs backport to`` label for the retired version
875858

876859
* review and dispose of open issues marked for this branch
877860

861+
- Run a final build of the online docs to add the end-of-life banner
862+
878863
- Announce the branch retirement in the usual places:
879864

880865
* `discuss.python.org`_

peps/pep-0440.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@ project)::
16241624
(?P<release>[0-9]+(?:\.[0-9]+)*) # release segment
16251625
(?P<pre> # pre-release
16261626
[-_\.]?
1627-
(?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
1627+
(?P<pre_l>alpha|a|beta|b|preview|pre|c|rc)
16281628
[-_\.]?
16291629
(?P<pre_n>[0-9]+)?
16301630
)?

peps/pep-0525.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ The following methods and properties are defined:
336336

337337
v = await g.athrow(ZeroDivisionError)
338338
print(v) # Will print 'world' after
339-
$ sleeping 0.2 seconds.
339+
# sleeping 0.2 seconds.
340340

341341
5. ``agen.aclose()``: Returns an *awaitable*, that throws a
342342
``GeneratorExit`` exception into the generator. The *awaitable* can

peps/pep-0540.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ The "Legacy Windows FS encoding" is enabled by the
256256
``PYTHONLEGACYWINDOWSFSENCODING`` environment variable.
257257

258258
If stdin and/or stdout is redirected to a pipe, ``sys.stdin`` and/or
259-
``sys.output`` uses ``mbcs`` encoding by default rather than UTF-8.
259+
``sys.stdout`` uses ``mbcs`` encoding by default rather than UTF-8.
260260
But in UTF-8 Mode, ``sys.stdin`` and ``sys.stdout`` always use the UTF-8
261261
encoding.
262262

peps/pep-0601.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Type: Standards Track
88
Created: 26-Aug-2019
99
Python-Version: 3.8
1010
Post-History: 26-Aug-2019, 23-Sep-2019
11+
Superseded-By: 765
1112
Resolution: https://discuss.python.org/t/pep-601-forbid-return-break-continue-breaking-out-of-finally/2239/32
1213

1314
Rejection Note

peps/pep-0672.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ This document purposefully does not give any solutions
3939
or recommendations: it is rather a list of things to keep in mind.
4040

4141
This document is specific to Python.
42-
For general security considerations in Unicode text, see [tr36]_ and [tr39]_.
42+
For general security considerations in Unicode text and source code,
43+
see Unicode technical reports [tr36]_, [tr39]_, and [tr55]_.
4344

4445

4546
Acknowledgement
@@ -378,6 +379,8 @@ References
378379
http://www.unicode.org/reports/tr36/
379380
.. [tr39] Unicode® Technical Standard #39: Unicode Security Mechanisms
380381
http://www.unicode.org/reports/tr39/
382+
.. [tr55] Unicode Technical Report #55: Unicode Source Code Handling
383+
http://www.unicode.org/reports/tr55/
381384
.. _CVE-2021-42574:
382385
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42574
383386
.. _`Encoding declarations`: https://docs.python.org/3/reference/lexical_analysis.html#encoding-declarations

peps/pep-0719.rst

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,29 @@ Actual:
5252
- 3.13.0 candidate 3: Tuesday, 2024-10-01
5353
- 3.13.0 final: Monday, 2024-10-07
5454

55+
Bugfix releases
56+
---------------
57+
5558
Expected:
5659

57-
Subsequent bugfix releases every two months.
60+
- 3.13.1: Tuesday, 2024-12-03
61+
- 3.13.2: Tuesday, 2025-02-04
62+
- 3.13.3: Tuesday, 2025-04-08
63+
- 3.13.4: Tuesday, 2025-06-03
64+
- 3.13.5: Tuesday, 2025-08-05
65+
- 3.13.6: Tuesday, 2025-10-07
66+
- 3.13.7: Tuesday, 2025-12-02
67+
- 3.13.8: Tuesday, 2026-02-03
68+
- 3.13.9: Tuesday, 2026-04-07
69+
- 3.13.10: Tuesday, 2026-06-09
70+
- 3.13.11: Tuesday, 2026-08-04
71+
- 3.13.12: Tuesday, 2026-10-06
72+
73+
74+
Source-only security fix releases
75+
---------------------------------
76+
77+
Provided irregularly on an as-needed basis until October 2029.
5878

5979

6080
3.13 Lifespan

0 commit comments

Comments
 (0)