From 9db15c57195384e14dba7c6f99cfa08484ee4d56 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:01:56 +0200 Subject: [PATCH 01/11] python-dev@python.org has been archived https://www.mail-archive.com/python-dev@python.org/msg116752.html --- peps/pep-0101.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index cb9f8840855..606eaba04c5 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -742,7 +742,6 @@ permissions. * python-list@python.org * python-announce@python.org - * python-dev@python.org - Also post the announcement to the `Python Insider blog `_. From 909f1ff036c01ca0bc714bd2e194c1259da4f8c1 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:17:48 +0200 Subject: [PATCH 02/11] The new branch is created when the last one enters beta --- peps/pep-0101.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index 606eaba04c5..c7e89f56424 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -755,7 +755,7 @@ permissions. - Flip all the `deferred-blocker`_ issues back to `release-blocker`_ for the next release. - - Add version ``3.X+1`` as when version ``3.X`` enters alpha. + - Add version ``3.X+1`` when version ``3.X`` enters beta. - Change non-doc feature requests to version ``3.X+1`` when version ``3.X`` enters beta. From 28c148ff3a024dfa12edf74d05d523de55025433 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:21:15 +0200 Subject: [PATCH 03/11] Move 'add label' instructions to same place --- peps/pep-0101.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index c7e89f56424..b495052d7ed 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -610,7 +610,7 @@ the main repo. release branch (3.X-1) and use them as a template. https://github.com/python/cpython/settings/branches - Also, add a ``needs backport to 3.X`` label to the GitHub repo. + Also, add ``3.x`` and ``needs backport to 3.X`` labels to the GitHub repo. https://github.com/python/cpython/labels - You can now re-enable enforcement of branch settings against administrators @@ -755,8 +755,6 @@ permissions. - Flip all the `deferred-blocker`_ issues back to `release-blocker`_ for the next release. - - Add version ``3.X+1`` when version ``3.X`` enters beta. - - Change non-doc feature requests to version ``3.X+1`` when version ``3.X`` enters beta. From f29fca684418869459e4309f9df8cdeee630d27e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:23:44 +0200 Subject: [PATCH 04/11] devguide: 'Feature requests do not need version labels; it is implicit that features are added to the main branch only' https://devguide.python.org/triage/labels/#type-labels --- peps/pep-0101.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index b495052d7ed..5ad3f26e9ef 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -755,9 +755,6 @@ permissions. - Flip all the `deferred-blocker`_ issues back to `release-blocker`_ for the next release. - - Change non-doc feature requests to version ``3.X+1`` when version ``3.X`` - enters beta. - - Update issues from versions that your release makes unsupported to the next supported version. From 3b5b891253773c3ee3a8588541bde1df560de12f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:27:19 +0200 Subject: [PATCH 05/11] Move instruction on bumping issue versions to branch retirement section --- peps/pep-0101.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index 5ad3f26e9ef..1c9a13afce5 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -755,9 +755,6 @@ permissions. - Flip all the `deferred-blocker`_ issues back to `release-blocker`_ for the next release. - - Update issues from versions that your release makes - unsupported to the next supported version. - - Review open issues, as this might find lurking showstopper bugs, besides reminding people to fix the easy ones they forgot about. @@ -863,6 +860,8 @@ else does them. Some of those tasks include: - Retire the release from the `issue tracker`_. Tasks include: + * update issues from this version to the next supported version + * remove version label from list of versions * remove the ``needs backport to`` label for the retired version From 174b82b9f8434e89ea638d5caa0b3df83ad67c41 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:32:11 +0200 Subject: [PATCH 06/11] Link to release PEPs --- peps/pep-0101.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index 1c9a13afce5..8b4d04647bd 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -748,7 +748,8 @@ permissions. To add a new entry, go to `your Blogger home page, here `_. -- Update any release PEPs (e.g. 719) with the release dates. +- Update `release PEPs `__ + (e.g. 719) with the release dates. - Update the labels on https://github.com/python/cpython/issues: From 16a20e7204f6e491d8f9efc4f3c65f82f99452ca Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:36:17 +0200 Subject: [PATCH 07/11] Wording --- peps/pep-0101.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index 8b4d04647bd..fe9b38c0b40 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -746,7 +746,7 @@ permissions. - Also post the announcement to the `Python Insider blog `_. To add a new entry, go to - `your Blogger home page, here `_. + `your Blogger home page `_. - Update `release PEPs `__ (e.g. 719) with the release dates. @@ -780,7 +780,7 @@ permissions. or Zach Ware). - Ensure the various GitHub bots are updated, as needed, for the - new branch, in particular, make sure backporting to the new + new branch. In particular, make sure backporting to the new branch works (contact the `core-workflow team `__). @@ -793,7 +793,7 @@ permissions. branches and that the release branch is properly protected (no direct pushes, etc). - - Verify that the `on-line docs `__ are building + - Verify that the `online docs `__ are building properly (this may take up to 24 hours for a complete build on the website). From 760c6229d52349f25f86363087e16871780c60a8 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:58:32 +0200 Subject: [PATCH 08/11] http -> https --- peps/pep-0101.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index fe9b38c0b40..79133cee857 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -637,7 +637,7 @@ permissions. Python release "page", editing as you go. You can use `Markdown `_ or - `reStructured Text `_ + `reStructured Text `_ to describe your release. The former is less verbose, while the latter has nifty integration for things like referencing PEPs. @@ -744,7 +744,7 @@ permissions. * python-announce@python.org - Also post the announcement to the - `Python Insider blog `_. + `Python Insider blog `_. To add a new entry, go to `your Blogger home page `_. From d3ee544e085174ba85b30fc1f7e22489e5e95614 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:15:07 +0200 Subject: [PATCH 09/11] We no longer need to update years in copyright notices --- peps/pep-0101.rst | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index 79133cee857..3c688499516 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -263,20 +263,6 @@ to perform some manual editing steps. - Make sure all changes have been committed. (``release.py --bump`` doesn't check in its changes for you.) -- Check the years on the copyright notice. If the last release - was some time last year, add the current year to the copyright - notice in several places: - - - ``README`` - - ``LICENSE`` (make sure to change on ``main`` and the branch) - - ``Python/getcopyright.c`` - - ``Doc/copyright.rst`` - - ``Doc/license.rst`` - - ``PC/python_ver_rc.h`` sets up the DLL version resource for Windows - (displayed when you right-click on the DLL and select - Properties). This isn't a C include file, it's a Windows - "resource file" include file. - - For a **final** major release, edit the first paragraph of ``Doc/whatsnew/3.X.rst`` to include the actual release date; e.g. "Python 2.5 was released on August 1, 2003." There's no need to edit this for From ee11e609ea2659e7e967d83be17653f1da15f61b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 25 Nov 2024 21:55:36 +0200 Subject: [PATCH 10/11] Note no GPG for 3.14+ due to PEP 761 --- peps/pep-0101.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index 3c688499516..f028abd39c4 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -33,10 +33,13 @@ Here's a hopefully-complete list. * A GPG key. - Python releases are digitally signed with GPG; you'll need a key, - which hopefully will be on the "web of trust" with at least one of + Python releases before 3.14 are digitally signed with GPG; for these you'll + need a key, which hopefully will be on the "web of trust" with at least one of the other release managers. + .. note:: GPG instructions in this PEP can be ignored for Python 3.14 and + later. See :pep:`761` for details. + * A bunch of software: * A checkout of the `python/release-tools`_ repo. From 96067a033ddc989dbfec156174caa8c7842ddd1f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 25 Nov 2024 21:56:00 +0200 Subject: [PATCH 11/11] Run a final docs build when EOL to add the banner --- peps/pep-0101.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/peps/pep-0101.rst b/peps/pep-0101.rst index f028abd39c4..32ca362cfa8 100644 --- a/peps/pep-0101.rst +++ b/peps/pep-0101.rst @@ -858,6 +858,8 @@ else does them. Some of those tasks include: * review and dispose of open issues marked for this branch +- Run a final build of the online docs to add the end-of-life banner + - Announce the branch retirement in the usual places: * `discuss.python.org`_