@@ -36,8 +36,7 @@ Branches
3636''''''''
3737
3838There is a branch for each *feature version *, whether released or not (e.g.
39- 2.7, 3.7, 3.8). Development is handled separately for Python 2 and Python 3:
40- no merging happens between 2.x and 3.x branches.
39+ 3.7, 3.8).
4140
4241
4342.. _indevbranch :
@@ -68,12 +67,11 @@ Maintenance branches
6867--------------------
6968
7069A branch for a previous feature release, currently being maintained for bug
71- fixes. There are usually two maintenance branches at any given time: one for
72- Python 3.x and one for Python 2.x . Only during the beta/rc phase of a new
70+ fixes. There are usually two maintenance branches at any given time for
71+ Python 3.x. Only during the beta/rc phase of a new
7372minor/feature release will there be three active maintenance branches, e.g.
74- during the beta phase for Python 3.8 there are master, 3.8, 3.7, and 2.7
75- branches open. At some point in the future, Python 2.x will be closed for bug
76- fixes and there will be only one maintenance branch left. Releases
73+ during the beta phase for Python 3.8 there are master, 3.8, 3.7, and 3.6
74+ branches open. Releases
7775produced from a maintenance branch are called **maintenance ** or **bugfix **
7876releases; the terms are used interchangeably. These releases have a
7977**micro version ** number greater than zero.
@@ -140,6 +138,8 @@ For reference, here are the Python versions that most recently reached their end
140138+------------------+--------------+----------------+----------------+----------------------------------+
141139| 2.6 | :pep: `361 ` | 2008-10-01 | 2013-10-29 | Barry Warsaw |
142140+------------------+--------------+----------------+----------------+----------------------------------+
141+ | 2.7 | :pep: `373 ` | 2010-07-03 | 2020-01-01 | Benjamin Peterson |
142+ +------------------+--------------+----------------+----------------+----------------------------------+
143143
144144The latest release for each Python version can be found on the `download page
145145<https://www.python.org/downloads/> `_.
@@ -307,8 +307,6 @@ Current Administrators
307307+===================+==========================================================+=================+
308308| Łukasz Langa | Python 3.8 and 3.9 Release Manager | ambv |
309309+-------------------+----------------------------------------------------------+-----------------+
310- | Benjamin Peterson | Python 2.7 Release Manager | benjaminp |
311- +-------------------+----------------------------------------------------------+-----------------+
312310| Ned Deily | Python 3.7 Release Manager | ned-deily |
313311+-------------------+----------------------------------------------------------+-----------------+
314312| Lary Hastings | Python 3.5 Release Manager | larryhastings |
0 commit comments