Skip to content

Commit 2404215

Browse files
Merge branch 'main' into 3.13-release
2 parents 01a2d21 + 861f17f commit 2404215

23 files changed

+3764
-800
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,12 @@ peps/pep-0802.rst @AA-Turner
681681
peps/pep-0803.rst @encukou
682682
peps/pep-0804.rst @pradyunsg
683683
# ...
684+
peps/pep-0806.rst @JelleZijlstra
685+
peps/pep-0807.rst @dstufft
686+
# ...
687+
peps/pep-0809.rst @zooba
688+
peps/pep-0810.rst @pablogsal @DinoV @Yhg1s
689+
# ...
684690
peps/pep-2026.rst @hugovk
685691
# ...
686692
peps/pep-3000.rst @gvanrossum

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
persist-credentials: false
2525

2626
- name: Set up Python 3
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.x"
3030

.github/workflows/render.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fetch-depth: 0 # fetch all history so that last modified date-times are accurate
3333

3434
- name: Set up Python ${{ matrix.python-version }}
35-
uses: actions/setup-python@v5
35+
uses: actions/setup-python@v6
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838
cache: pip

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
persist-credentials: false
4747

4848
- name: Set up Python ${{ matrix.python-version }}
49-
uses: actions/setup-python@v5
49+
uses: actions/setup-python@v6
5050
with:
5151
python-version: ${{ matrix.python-version }}
5252
allow-prereleases: true

peps/pep-0489.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Python-Version: 3.5
1212
Post-History: 23-Aug-2013, 20-Feb-2015, 16-Apr-2015, 07-May-2015, 18-May-2015
1313
Resolution: https://mail.python.org/pipermail/python-dev/2015-May/140108.html
1414

15-
.. canonical-doc:: :ref:`python:initializing-modules`.
16-
For Python 3.14+, see :ref:`py3.14:extension-modules`
17-
and :ref:`py3.14:pymoduledef`
15+
.. canonical-doc:: :ref:`py3.13:initializing-modules`.
16+
For Python 3.14+, see :ref:`python:extension-modules`
17+
and :ref:`python:pymoduledef`
1818

1919
.. highlight:: c
2020

peps/pep-0518.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ the ``pyproject.toml`` file will be::
164164

165165
[build-system]
166166
# Minimum requirements for the build system to execute.
167-
requires = ["setuptools", "wheel"] # PEP 508 specifications.
167+
requires = ["setuptools"] # PEP 508 specifications.
168168

169-
Because the use of setuptools and wheel are so expansive in the
169+
Because the use of setuptools is so expansive in the
170170
community at the moment, build tools are expected to use the example
171171
configuration file above as their default semantics when a
172172
``pyproject.toml`` file is not present.

peps/pep-0523.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PEP: 523
22
Title: Adding a frame evaluation API to CPython
33
Author: Brett Cannon <brett@python.org>,
4-
Dino Viehland <dinov@microsoft.com>
4+
Dino Viehland <dinoviehland@gmail.com>
55
Status: Final
66
Type: Standards Track
77
Created: 16-May-2016

peps/pep-0649.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PEP: 649
22
Title: Deferred Evaluation Of Annotations Using Descriptors
33
Author: Larry Hastings <larry@hastings.org>
44
Discussions-To: https://discuss.python.org/t/pep-649-deferred-evaluation-of-annotations-tentatively-accepted/21331/
5-
Status: Accepted
5+
Status: Final
66
Type: Standards Track
77
Topic: Typing
88
Created: 11-Jan-2021
@@ -21,6 +21,8 @@ Post-History: `11-Jan-2021 <https://mail.python.org/archives/list/python-dev@pyt
2121
Replaces: 563
2222
Resolution: `08-May-2023 <https://discuss.python.org/t/pep-649-deferred-evaluation-of-annotations-tentatively-accepted/21331/43>`__
2323

24+
.. canonical-doc:: :ref:`annotations`
25+
2426
********
2527
Abstract
2628
********

peps/pep-0679.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Status: Draft
77
Type: Standards Track
88
Created: 07-Jan-2022
99
Python-Version: 3.15
10-
Post-History: `10-Jan-2022 <https://discuss.python.org/t/pep-679-allow-parentheses-in-assert-statements/13003>`__
10+
Post-History: `08-Sep-2025 <https://discuss.python.org/t/pep-679-new-assert-statement-syntax-with-parentheses/103634>`__,
11+
`10-Jan-2022 <https://discuss.python.org/t/pep-679-allow-parentheses-in-assert-statements/13003>`__
1112

1213

1314
Abstract
@@ -132,10 +133,10 @@ specification.
132133
(Note that, without the warning specification the pure parser implementation is
133134
a small grammar change [#previmp]_).
134135
To raise the warning, the compiler must
135-
be aware of the new syntax, which means that a flag would be necessary as
136-
otherwise the information is lost during parsing.
137-
As such, the AST of an :keyword:`assert` would look like so,
138-
with a ``paren_syntax`` flag::
136+
be aware of the new syntax, this means that an optional flag would be necessary
137+
as otherwise the information is lost during parsing.
138+
As such, the AST of an :keyword:`assert` with parentheses would look like so,
139+
with a ``paren_syntax=1`` flag::
139140

140141
>>> print(ast.dump(ast.parse('assert(True, "Error message")'), indent=4))
141142
Module(
@@ -145,8 +146,6 @@ with a ``paren_syntax`` flag::
145146
msg=Constant(value='Error message'),
146147
paren_syntax=1)])
147148

148-
The flag would be removed in 3.18 along with the :exc:`SyntaxWarning`.
149-
150149

151150
Implementing in the compiler
152151
----------------------------

0 commit comments

Comments
 (0)