From 55d614149024b2595c60477e585f2dbe60af17d9 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Tue, 14 Jan 2020 09:26:18 -0500 Subject: [PATCH 1/3] Mark python 2.7 as dead --- index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.rst b/index.rst index f5feda008..5aef26d86 100644 --- a/index.rst +++ b/index.rst @@ -99,7 +99,7 @@ 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 | +| 2.7 | :pep:`373` | unsupported | 2010-07-03 | *2020-01-01* | Benjamin Peterson | +------------------+--------------+-------------+----------------+----------------+-------------------+ | 3.6 | :pep:`494` | security | 2016-12-23 | *2021-12-23* | Ned Deily | +------------------+--------------+-------------+----------------+----------------+-------------------+ @@ -127,8 +127,8 @@ 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. +Python 2.7 was extended to 2020-01-01. All Python 2 versions have reached +end-of-life. See also the :ref:`devcycle` page for more information about branches. From 10341ee1e430d98c6addac08f7416c5af93b0f24 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Thu, 16 Jan 2020 09:26:16 -0500 Subject: [PATCH 2/3] Remove from table --- index.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/index.rst b/index.rst index 5aef26d86..5bc5899d9 100644 --- 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` | unsupported | 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 was extended to 2020-01-01. All Python 2 versions 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. From a02c365fa83e408f9689ea95efe2ad394c432b00 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Mon, 27 Jan 2020 14:39:53 +0000 Subject: [PATCH 3/3] update devcycle --- devcycle.rst | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/devcycle.rst b/devcycle.rst index add010f6c..e7a3db845 100644 --- a/devcycle.rst +++ b/devcycle.rst @@ -37,8 +37,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: @@ -69,12 +68,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. @@ -141,6 +139,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 `_. @@ -308,8 +308,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 |