Skip to content

Commit d406b6e

Browse files
authored
Merge branch 'main' into warsaw/pep-694-updates
2 parents fc65918 + ed44bb0 commit d406b6e

File tree

9 files changed

+704
-79
lines changed

9 files changed

+704
-79
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ peps/pep-0762.rst @pablogsal @ambv @lysnikolaou @emilyemorehouse
643643
peps/pep-0763.rst @dstufft
644644
peps/pep-0765.rst @iritkatriel @ncoghlan
645645
peps/pep-0766.rst @warsaw
646+
peps/pep-0767.rst @carljm
646647
# ...
647648
peps/pep-0777.rst @warsaw
648649
# ...

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-0352.rst

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
PEP: 352
22
Title: Required Superclass for Exceptions
3-
Version: $Revision$
4-
Last-Modified: $Date$
53
Author: Brett Cannon, Guido van Rossum
64
Status: Final
75
Type: Standards Track
8-
Content-Type: text/x-rst
96
Created: 27-Oct-2005
107
Python-Version: 2.5
118
Post-History:
@@ -276,24 +273,13 @@ References
276273
.. [#hierarchy-good] python-dev Summary for 2004-08-01 through 2004-08-15
277274
http://www.python.org/dev/summary/2004-08-01_2004-08-15.html#an-exception-is-an-exception-unless-it-doesn-t-inherit-from-exception
278275
279-
.. [#SF_1104669] SF patch #1104669 (new-style exceptions)
280-
https://bugs.python.org/issue1104669
281-
282276
.. [#pycon2007-sprint-email] python-3000 email ("How far to go with cleaning up exceptions")
283277
https://mail.python.org/pipermail/python-3000/2007-March/005911.html
284278
279+
* Issue for new-style exceptions:
280+
`python/cpython#41459 <https://github.com/python/cpython/issues/41459>`__
285281

286282
Copyright
287283
=========
288284

289285
This document has been placed in the public domain.
290-
291-
292-
293-
..
294-
Local Variables:
295-
mode: indented-text
296-
indent-tabs-mode: nil
297-
sentence-end-double-space: t
298-
fill-column: 70
299-
End:

peps/pep-0440.rst

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

peps/pep-0672.rst

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Title: Unicode-related Security Considerations for Python
33
Author: Petr Viktorin <encukou@gmail.com>
44
Status: Active
55
Type: Informational
6-
Content-Type: text/x-rst
76
Created: 01-Nov-2021
87
Post-History: 01-Nov-2021
98

@@ -40,7 +39,8 @@ This document purposefully does not give any solutions
4039
or recommendations: it is rather a list of things to keep in mind.
4140

4241
This document is specific to Python.
43-
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]_.
4444

4545

4646
Acknowledgement
@@ -379,6 +379,8 @@ References
379379
http://www.unicode.org/reports/tr36/
380380
.. [tr39] Unicode® Technical Standard #39: Unicode Security Mechanisms
381381
http://www.unicode.org/reports/tr39/
382+
.. [tr55] Unicode Technical Report #55: Unicode Source Code Handling
383+
http://www.unicode.org/reports/tr55/
382384
.. _CVE-2021-42574:
383385
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42574
384386
.. _`Encoding declarations`: https://docs.python.org/3/reference/lexical_analysis.html#encoding-declarations
@@ -391,15 +393,3 @@ Copyright
391393

392394
This document is placed in the public domain or under the
393395
CC0-1.0-Universal license, whichever is more permissive.
394-
395-
396-
397-
..
398-
Local Variables:
399-
mode: indented-text
400-
indent-tabs-mode: nil
401-
sentence-end-double-space: t
402-
fill-column: 70
403-
coding: utf-8
404-
End:
405-

peps/pep-0740.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ Author: William Woodruff <william@yossarian.net>,
66
Sponsor: Donald Stufft <donald@stufft.io>
77
PEP-Delegate: Donald Stufft <donald@stufft.io>
88
Discussions-To: https://discuss.python.org/t/pep-740-index-support-for-digital-attestations/44498
9-
Status: Provisional
9+
Status: Final
1010
Type: Standards Track
1111
Topic: Packaging
1212
Created: 08-Jan-2024
1313
Post-History: `02-Jan-2024 <https://discuss.python.org/t/pre-pep-exposing-trusted-publisher-provenance-on-pypi/42337>`__,
1414
`29-Jan-2024 <https://discuss.python.org/t/pep-740-index-support-for-digital-attestations/44498>`__
15-
Resolution: https://discuss.python.org/t/pep-740-index-support-for-digital-attestations/44498/26
15+
Resolution: `17-Jul-2024 <https://discuss.python.org/t/pep-740-index-support-for-digital-attestations/44498/26>`__
1616

17+
.. canonical-pypa-spec:: :ref:`packaging:index-hosted-attestations`
18+
19+
.. canonical-doc:: `PyPI - Digital Attestations <https://docs.pypi.org/attestations/>`__
1720

1821
Abstract
1922
========

peps/pep-0743.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Title: Add Py_COMPAT_API_VERSION to the Python C API
33
Author: Victor Stinner <vstinner@python.org>,
44
Petr Viktorin <encukou@gmail.com>,
55
PEP-Delegate: C API Working Group
6-
Discussions-To: https://discuss.python.org/t/pep-743-add-py-compat-api-version-to-the-python-c-api/48243
6+
Discussions-To: https://discuss.python.org/t/pep-743-add-py-compat-api-version-to-the-python-c-api-take-2/59323
77
Status: Draft
88
Type: Standards Track
99
Created: 11-Mar-2024
@@ -375,16 +375,22 @@ for one source file at a time.
375375
Discussions
376376
===========
377377

378+
* `PEP 743 – Add Py_COMPAT_API_VERSION to the Python C API (take 2)
379+
<https://discuss.python.org/t/pep-743-add-py-compat-api-version-to-the-python-c-api-take-2/59323>`__
380+
(July 2024)
381+
* `Finishing the Great Renaming
382+
<https://discuss.python.org/t/finishing-the-great-renaming/54082>`_
383+
(May 2024)
384+
* `PEP 743: Add Py_COMPAT_API_VERSION to the Python C API
385+
<https://discuss.python.org/t/pep-743-add-py-compat-api-version-to-the-python-c-api/48243>`_
386+
(March 2024)
378387
* C API Evolutions: `Macro to hide deprecated functions
379388
<https://github.com/capi-workgroup/api-evolution/issues/24>`_
380389
(October 2023)
381390
* C API Problems: `Opt-in macro for a new clean API? Subset of functions
382391
with no known issues
383392
<https://github.com/capi-workgroup/problems/issues/54>`_
384393
(June 2023)
385-
* `Finishing the Great Renaming
386-
<https://discuss.python.org/t/finishing-the-great-renaming/54082>`_
387-
(May 2024)
388394

389395

390396
Prior Art

peps/pep-0757.rst

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ PEP: 757
22
Title: C API to import-export Python integers
33
Author: Sergey B Kirpichev <skirpichev@gmail.com>,
44
Victor Stinner <vstinner@python.org>
5-
PEP-Delegate: C API Working Group
65
Discussions-To: https://discuss.python.org/t/63895
76
Status: Draft
87
Type: Standards Track
@@ -80,7 +79,7 @@ functions.
8079
- ``1`` for most significant digit first
8180
- ``-1`` for least significant digit first
8281

83-
.. c:member:: int8_t endianness
82+
.. c:member:: int8_t digit_endianness
8483
8584
Digit endianness:
8685

@@ -178,19 +177,20 @@ create a Python :class:`int` object from a digits array.
178177
179178
Create a :c:type:`PyLongWriter`.
180179
181-
On success, set *\*digits* and return a writer.
180+
On success, allocate *\*digits* and return a writer.
182181
On error, set an exception and return ``NULL``.
183182
184183
*negative* is ``1`` if the number is negative, or ``0`` otherwise.
185184
186-
*ndigits* is the number of digits in the *digits* array. It must be
187-
greater than or equal to 0.
185+
*ndigits* is the number of digits in the *digits* array. It must be
186+
greater than 0.
188187
189-
The caller can either initialize the array of digits *digits* and then call
190-
:c:func:`PyLongWriter_Finish` to get a Python :class:`int`, or call
188+
The caller can either initialize the array of digits *digits* and then
189+
either call :c:func:`PyLongWriter_Finish` to get a Python :class:`int` or
191190
:c:func:`PyLongWriter_Discard` to destroy the writer instance. Digits must
192-
be in the range [``0``; ``(1 << sys.int_info.bits_per_digit) - 1``]. Unused
193-
digits must be set to ``0``.
191+
be in the range [``0``; ``(1 << bits_per_digit) - 1``] (where the
192+
:c:struct:`~PyLongLayout.bits_per_digit` is the number of bits per digit).
193+
The unused most-significant digits must be set to ``0``.
194194
195195
196196
On CPython 3.14, the :c:func:`PyLongWriter_Create` implementation is a thin
@@ -207,11 +207,15 @@ wrapper to the private :c:func:`!_PyLong_New()` function.
207207
The function takes care of normalizing the digits and converts the
208208
object to a compact integer if needed.
209209
210+
The writer instance is invalid after the call.
211+
210212
211213
.. c:function:: void PyLongWriter_Discard(PyLongWriter *writer)
212214
213215
Discard a :c:type:`PyLongWriter` created by :c:func:`PyLongWriter_Create`.
214216
217+
The writer instance is invalid after the call.
218+
215219
216220
Optimize import for small integers
217221
==================================
@@ -253,7 +257,7 @@ Code::
253257
int int_digits_order = layout->digits_order;
254258
size_t int_bits_per_digit = layout->bits_per_digit;
255259
size_t int_nails = int_digit_size*8 - int_bits_per_digit;
256-
int int_endianness = layout->endianness;
260+
int int_endianness = layout->digit_endianness;
257261
258262
259263
Export: :c:func:`PyLong_Export()` with gmpy2

0 commit comments

Comments
 (0)