Skip to content

Commit f547502

Browse files
authored
Merge branch 'main' into emails
2 parents 7df079b + 628e256 commit f547502

File tree

12 files changed

+472
-21
lines changed

12 files changed

+472
-21
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ peps/pep-0808.rst @FFY00
687687
peps/pep-0809.rst @zooba
688688
peps/pep-0810.rst @pablogsal @DinoV @Yhg1s
689689
peps/pep-0811.rst @sethmlarson @gpshead
690-
# ...
690+
peps/pep-0813.rst @warsaw @ericvsmith
691691
peps/pep-0814.rst @vstinner @corona10
692692
peps/pep-0815.rst @emmatyping
693693
peps/pep-0816.rst @brettcannon
@@ -698,6 +698,7 @@ peps/pep-0819.rst @emmatyping
698698
peps/pep-0820.rst @encukou
699699
peps/pep-0821.rst @JelleZijlstra
700700
peps/pep-0822.rst @methane
701+
peps/pep-0826.rst @savannahostrowski
701702
# ...
702703
peps/pep-2026.rst @hugovk
703704
# ...

.github/PULL_REQUEST_TEMPLATE/Add a new PEP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ If your PEP is not Standards Track, remove the corresponding section.
2929
* [ ] PEP topic [discussed in a suitable venue](https://peps.python.org/pep-0001/#start-with-an-idea-for-python) with general agreement that a PEP is appropriate
3030
* [ ] [Suggested sections](https://peps.python.org/pep-0012/#suggested-sections) included (unless not applicable)
3131
* [ ] Motivation
32-
* [ ] Rationale
3332
* [ ] Specification
33+
* [ ] Rationale
3434
* [ ] Backwards Compatibility
3535
* [ ] Security Implications
3636
* [ ] How to Teach This

peps/pep-0001.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,13 @@ Each PEP should have the following parts/sections:
509509
projects in the Python ecosystem. PEP submissions without
510510
sufficient motivation may be rejected.
511511

512-
4. Rationale -- The rationale fleshes out the specification by
512+
4. Specification -- The technical specification should describe the
513+
syntax and semantics of any new language feature. The
514+
specification should be detailed enough to allow competing,
515+
interoperable implementations for at least the current major Python
516+
platforms (CPython, Jython, IronPython, PyPy).
517+
518+
5. Rationale -- The rationale fleshes out the specification by
513519
describing why particular design decisions were made. It should
514520
describe alternate designs that were considered and related work,
515521
e.g. how the feature is supported in other languages.
@@ -518,12 +524,6 @@ Each PEP should have the following parts/sections:
518524
community and discuss important objections or concerns raised
519525
during discussion.
520526

521-
5. Specification -- The technical specification should describe the
522-
syntax and semantics of any new language feature. The
523-
specification should be detailed enough to allow competing,
524-
interoperable implementations for at least the current major Python
525-
platforms (CPython, Jython, IronPython, PyPy).
526-
527527
6. Backwards Compatibility -- All PEPs that introduce backwards
528528
incompatibilities must include a section describing these
529529
incompatibilities and their severity. The PEP must explain how the

peps/pep-0012.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@ The source for this (or any) PEP can be found in the
3232
as well as via a link at the bottom of each PEP.
3333

3434

35-
Rationale
36-
=========
35+
Specification
36+
=============
3737

3838
If you intend to submit a PEP, you MUST use this template, in
3939
conjunction with the format guidelines below, to ensure that your PEP
4040
submission won't get automatically rejected because of form.
4141

42+
43+
Rationale
44+
=========
45+
4246
ReStructuredText provides PEP authors with useful functionality and
4347
expressivity, while maintaining easy readability in the source text.
4448
The processed HTML form makes the functionality accessible to readers:

peps/pep-0694.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ as experience is gained operating Upload 2.0.
11051105
Change History
11061106
==============
11071107

1108-
* `06-Dec-2025 <TBD>`__
1108+
* `07-Dec-2025 <https://discuss.python.org/t/pep-694-pypi-upload-api-2-0-round-2/101483/35>`__
11091109

11101110
* Error responses conform to the :rfc:`9457` format.
11111111

peps/pep-0743.rst

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,29 @@ PEP: 743
22
Title: Add Py_OMIT_LEGACY_API to the Python C API
33
Author: Victor Stinner <vstinner@python.org>,
44
Petr Viktorin <encukou@gmail.com>,
5-
PEP-Delegate: C API Working Group
65
Discussions-To: https://discuss.python.org/t/59323
7-
Status: Draft
6+
Status: Rejected
87
Type: Standards Track
98
Created: 11-Mar-2024
109
Python-Version: 3.15
1110
Post-History: `11-Mar-2024 <https://discuss.python.org/t/48243>`__,
1211
`27-Jul-2024 <https://discuss.python.org/t/59323>`__,
13-
12+
Resolution: `20-Feb-2026 <https://discuss.python.org/t/59323/20>`__
1413

1514
.. highlight:: c
1615

1716

17+
Rejection Notice
18+
================
19+
20+
The Steering Council has rejected this PEP in its current form:
21+
22+
While we agree that the problem the PEP tries to solve is one worth solving,
23+
we’re not convinced this is the correct approach.
24+
25+
See `the full post <https://discuss.python.org/t/59323/20>`_.
26+
27+
1828
Abstract
1929
========
2030

peps/pep-0783.rst

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ The platform tags will take the form:
8686

8787
.. code-block:: text
8888
89-
pyodide_${YEAR}_${PATCH}_wasm32
89+
pyodide_${PYTHON_MAJOR_MINOR}_${PATCH}_wasm32
9090
9191
Each one of these will be used with a specified Python version. For example, the
92-
platform tag ``pyodide_2025_0`` will be used with Python 3.13.
92+
platform tag ``pyodide_314_0`` will be used with Python 3.14.
9393

9494
Emscripten Wheel ABI
9595
--------------------
@@ -193,6 +193,24 @@ Security Implications
193193

194194
There are no security implications in this PEP.
195195

196+
Rejected Ideas
197+
==============
198+
199+
Alternative Options for the Platform Tag
200+
----------------------------------------
201+
202+
* ``pyodide_${YEAR}_${PATCH}`` -- This avoids potential confusion between e.g.,
203+
``314_0`` and Python ``3.14.0``. On the other hand, it makes the link between
204+
ABI and Python minor version ambiguous.
205+
206+
* ``pyodide_${MAJOR}_${MINOR}_${ABI_PATCH}`` -- this would handle a future
207+
two-digit major version, but the ABI patch version would be too easily
208+
confused with a Python patch version e.g., ``3_14_0`` seems to imply Python
209+
``3.14.0`` specifically rather than Python 3.14.x.
210+
211+
* No ABI patch version -- we hope never to need the patch version, but it's
212+
good to be prepared for unforseen problems.
213+
196214
How to Teach This
197215
=================
198216

peps/pep-0797.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ New APIs and important information about how to use them will be added to the
404404
Reference Implementation
405405
========================
406406

407-
The reference implementation of this PEP can be found
408-
`here <https://github.com/python/cpython/compare/main...ZeroIntensity:cpython:shared-object-proxy>`_.
407+
A reference implementation of this PEP can be found at
408+
`python/cpython#145150 <https://github.com/python/cpython/pull/145150>`_.
409409

410410
Rejected Ideas
411411
==============
@@ -426,7 +426,8 @@ Acknowledgements
426426
================
427427

428428
This PEP would not have been possible without discussion and feedback from
429-
Eric Snow, Petr Viktorin, Kirill Podoprigora, Adam Turner, and Yury Selivanov.
429+
Eric Snow, Petr Viktorin, Kirill Podoprigora, Adam Turner, Yury Selivanov, and
430+
Steve Dower.
430431

431432
Copyright
432433
=========

0 commit comments

Comments
 (0)