Mark python 2.7 as dead. (#560)

RDIL · web-flow · commit dc3d44dd59a7 · 2020-01-28T18:38:09.000-08:00
diff --git a/devcycle.rst b/devcycle.rst
@@ -36,8 +36,7 @@ Branches
 ''''''''
 
 There is a branch for each *feature version*, whether released or not (e.g.
-2.7, 3.7, 3.8).  Development is handled separately for Python 2 and Python 3:
-no merging happens between 2.x and 3.x branches.
+3.7, 3.8).
 
 
 .. _indevbranch:
@@ -68,12 +67,11 @@ Maintenance branches
 --------------------
 
 A branch for a previous feature release, currently being maintained for bug
-fixes.  There are usually two maintenance branches at any given time: one for
-Python 3.x and one for Python 2.x. Only during the beta/rc phase of a new
+fixes.  There are usually two maintenance branches at any given time for
+Python 3.x. Only during the beta/rc phase of a new
 minor/feature release will there be three active maintenance branches, e.g.
-during the beta phase for Python 3.8 there are master, 3.8, 3.7, and 2.7
-branches open. At some point in the future, Python 2.x will be closed for bug
-fixes and there will be only one maintenance branch left.  Releases
+during the beta phase for Python 3.8 there are master, 3.8, 3.7, and 3.6
+branches open.  Releases
 produced from a maintenance branch are called **maintenance** or **bugfix**
 releases; the terms are used interchangeably. These releases have a
 **micro version** number greater than zero.
@@ -140,6 +138,8 @@ For reference, here are the Python versions that most recently reached their end
 +------------------+--------------+----------------+----------------+----------------------------------+
 | 2.6              | :pep:`361`   | 2008-10-01     | 2013-10-29     | Barry Warsaw                     |
 +------------------+--------------+----------------+----------------+----------------------------------+
+| 2.7              | :pep:`373`   | 2010-07-03     | 2020-01-01     | Benjamin Peterson                |
++------------------+--------------+----------------+----------------+----------------------------------+
 
 The latest release for each Python version can be found on the `download page
 <https://www.python.org/downloads/>`_.
@@ -307,8 +307,6 @@ Current Administrators
 +===================+==========================================================+=================+
 | Łukasz Langa      | Python 3.8 and 3.9 Release Manager                       | ambv            |
 +-------------------+----------------------------------------------------------+-----------------+
-| Benjamin Peterson | Python 2.7 Release Manager                               | benjaminp       |
-+-------------------+----------------------------------------------------------+-----------------+
 | Ned Deily         | Python 3.7 Release Manager                               | ned-deily       |
 +-------------------+----------------------------------------------------------+-----------------+
 | Lary Hastings     | Python 3.5 Release Manager                               | larryhastings   |
diff --git a/index.rst b/index.rst
@@ -99,8 +99,6 @@ Status of Python branches
 +------------------+--------------+-------------+----------------+----------------+-------------------+
 | 3.7              | :pep:`537`   | bugfix      | 2018-06-27     | *2023-06-27*   | Ned Deily         |
 +------------------+--------------+-------------+----------------+----------------+-------------------+
-| 2.7              | :pep:`373`   | bugfix      | 2010-07-03     | *2020-01-01*   | Benjamin Peterson |
-+------------------+--------------+-------------+----------------+----------------+-------------------+
 | 3.6              | :pep:`494`   | security    | 2016-12-23     | *2021-12-23*   | Ned Deily         |
 +------------------+--------------+-------------+----------------+----------------+-------------------+
 | 3.5              | :pep:`478`   | security    | 2015-09-13     | *2020-09-13*   | Larry Hastings    |
@@ -126,9 +124,8 @@ Status:
 Dates in *italic* are scheduled and can be adjusted.
 
 By default, the end-of-life is scheduled 5 years after the first release,
-but can be adjusted by the release manager of each branch.  The support for
-Python 2.7 has currently been extended to 2020-01-01.  Versions older than
-2.7 have reached end-of-life.
+but can be adjusted by the release manager of each branch.  All Python 2
+versions have reached end-of-life.
 
 See also the :ref:`devcycle` page for more information about branches.
 
