From 1e397612d2d2a2aceb949147b8cf7c490bec336e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 5 Nov 2025 11:46:23 +0200 Subject: [PATCH 1/3] It's always Python 3.x --- developer-workflow/development-cycle.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developer-workflow/development-cycle.rst b/developer-workflow/development-cycle.rst index c8b2d5ebf..1e46eb474 100644 --- a/developer-workflow/development-cycle.rst +++ b/developer-workflow/development-cycle.rst @@ -68,8 +68,8 @@ Maintenance branches A branch for a previous feature release, currently being maintained for bug fixes, or for the next feature release in its :ref:`beta ` or :ref:`release candidate ` stages. -There is usually either one or two maintenance branches at any given time for -Python 3.x. After the final release of a new minor version (3.x.0), releases +There is usually either one or two maintenance branches at any given time. +After the final release of a new minor version (3.x.0), releases produced from a maintenance branch are called **bugfix** or **maintenance** releases; the terms are used interchangeably. These releases have a **micro version** number greater than zero. From 2b5060be70f59ec372d17b519035cb21f450bac6 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 5 Nov 2025 11:46:33 +0200 Subject: [PATCH 2/3] a RC -> an RC --- developer-workflow/development-cycle.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developer-workflow/development-cycle.rst b/developer-workflow/development-cycle.rst index 1e46eb474..acfb72ffd 100644 --- a/developer-workflow/development-cycle.rst +++ b/developer-workflow/development-cycle.rst @@ -190,7 +190,7 @@ severe enough (for example, crashes) that they deserve fixing before the final r All other issues should be deferred to the next development cycle, since stability is the strongest concern at this point. -While the goal is to have no code changes between a RC and a final release, +While the goal is to have no code changes between an RC and a final release, there may be a need for final documentation or test fixes. Any such proposed changes should be discussed first with the release manager. From 270131a61358d1902bc27c8df9e616ebcc069ab9 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 5 Nov 2025 11:47:08 +0200 Subject: [PATCH 3/3] After a final is published in October, the dev cycle for the next minor had already started in May --- developer-workflow/development-cycle.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/developer-workflow/development-cycle.rst b/developer-workflow/development-cycle.rst index acfb72ffd..d5b8cde69 100644 --- a/developer-workflow/development-cycle.rst +++ b/developer-workflow/development-cycle.rst @@ -204,8 +204,7 @@ Final ^^^^^ When a final release is being cut, only the release manager (RM) can make -changes to the branch. After the final release is published, the full -:ref:`development cycle ` starts again for the next minor version. +changes to the branch. Repository administration