Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions developer-workflow/development-cycle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <beta>` or :ref:`release candidate <rc>` 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
Comment on lines +71 to +72
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's always Python 3.x, we don't care about 2.x any more.

If there's a 4.x, and things change, we'll update it then.

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.
Expand Down Expand Up @@ -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.

Expand All @@ -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 <stages>` starts again for the next minor version.
Comment on lines -207 to -208
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incorrect.

After the final release is published in October, the dev cycle for the next one had already started back in May.

changes to the branch.


Repository administration
Expand Down
Loading