From 83d22caefac6cda7f4bd6885ecb72d4d40a63b17 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Mon, 6 Jun 2022 20:04:39 +0200 Subject: [PATCH 01/10] Replace the "Status of the Python branches" table with a csv. --- branches.csv | 7 +++++++ index.rst | 20 +++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 branches.csv diff --git a/branches.csv b/branches.csv new file mode 100644 index 0000000000..b8438642f3 --- /dev/null +++ b/branches.csv @@ -0,0 +1,7 @@ +Branch,Schedule,Status,First release,End-of-life,Release manager +main,TBA,features,*2023-10-03*,*2028-10*,Thomas Wouters +3.11,:pep:`664`,bugfix,*2022-10-03*,*2027-10*,Pablo Galindo Salgado +3.10,:pep:`619`,bugfix,2021-10-04,*2026-10*,Pablo Galindo Salgado +3.9,:pep:`596`,security,2020-10-05,*2025-10*,Łukasz Langa +3.8,:pep:`569`,security,2019-10-14,*2024-10*,Łukasz Langa +3.7,:pep:`537`,security,2018-06-27,*2023-06-27*,Ned Deily diff --git a/index.rst b/index.rst index 0ffb6477ab..934fec40e8 100644 --- a/index.rst +++ b/index.rst @@ -94,22 +94,12 @@ contributing to Python: Status of Python branches ------------------------- -+------------------+--------------+-------------+----------------+----------------+-----------------------+ -| Branch | Schedule | Status | First release | End-of-life | Release manager | -+==================+==============+=============+================+================+=======================+ -| main | TBA | features | *2023-10-03* | *2028-10* | Thomas Wouters | -+------------------+--------------+-------------+----------------+----------------+-----------------------+ -| 3.11 | :pep:`664` | bugfix | *2022-10-03* | *2027-10* | Pablo Galindo Salgado | -+------------------+--------------+-------------+----------------+----------------+-----------------------+ -| 3.10 | :pep:`619` | bugfix | 2021-10-04 | *2026-10* | Pablo Galindo Salgado | -+------------------+--------------+-------------+----------------+----------------+-----------------------+ -| 3.9 | :pep:`596` | security | 2020-10-05 | *2025-10* | Łukasz Langa | -+------------------+--------------+-------------+----------------+----------------+-----------------------+ -| 3.8 | :pep:`569` | security | 2019-10-14 | *2024-10* | Łukasz Langa | -+------------------+--------------+-------------+----------------+----------------+-----------------------+ -| 3.7 | :pep:`537` | security | 2018-06-27 | *2023-06-27* | Ned Deily | -+------------------+--------------+-------------+----------------+----------------+-----------------------+ +.. csv-table:: + :header-rows: 1 + :widths: 15, 15, 15, 15, 15, 25 + :file: branches.csv +.. Update the status of the branches in branches.csv .. Remember to update the end-of-life table in devcycle.rst. Dates in *italic* are scheduled and can be adjusted. From b49e75bafaa0cc9e5ae199998f537b81e5d9af51 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 2 Jul 2022 17:56:31 +0200 Subject: [PATCH 02/10] Move `branches.csv` in a new `include` dir. --- branches.csv => include/branches.csv | 0 index.rst | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename branches.csv => include/branches.csv (100%) diff --git a/branches.csv b/include/branches.csv similarity index 100% rename from branches.csv rename to include/branches.csv diff --git a/index.rst b/index.rst index 934fec40e8..71fbd51f78 100644 --- a/index.rst +++ b/index.rst @@ -97,10 +97,11 @@ Status of Python branches .. csv-table:: :header-rows: 1 :widths: 15, 15, 15, 15, 15, 25 - :file: branches.csv + :file: include/branches.csv -.. Update the status of the branches in branches.csv -.. Remember to update the end-of-life table in devcycle.rst. +.. Update the status of the branches in include/branches.csv +.. Remember to update the end-of-life table in devcycle.rst, + and the main branch a couple of lines below. Dates in *italic* are scheduled and can be adjusted. From a39867fe6003d1981bef380c17af066c3273af62 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 2 Jul 2022 18:12:20 +0200 Subject: [PATCH 03/10] Replace the "End-of-life branches" table with a csv. --- devcycle.rst | 26 +++++--------------------- include/end-of-life.csv | 10 ++++++++++ 2 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 include/end-of-life.csv diff --git a/devcycle.rst b/devcycle.rst index a5c2a472c2..630760ae04 100644 --- a/devcycle.rst +++ b/devcycle.rst @@ -128,27 +128,11 @@ former branch, e.g. ``3.3`` or ``2.6``. For reference, here are the Python versions that most recently reached their end-of-life: -+------------------+--------------+----------------+----------------+----------------------------------+ -| Branch | Schedule | First release | End-of-life | Release manager | -+==================+==============+================+================+==================================+ -| 3.6 | :pep:`494` | 2016-12-23 | 2021-12-23 | Ned Deily | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 3.5 | :pep:`478` | 2015-09-13 | 2020-09-30 | Larry Hastings | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 3.4 | :pep:`429` | 2014-03-16 | 2019-03-18 | Larry Hastings | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 3.3 | :pep:`398` | 2012-09-29 | 2017-09-29 | Georg Brandl, Ned Deily (3.3.7+) | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 3.2 | :pep:`392` | 2011-02-20 | 2016-02-20 | Georg Brandl | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 3.1 | :pep:`375` | 2009-06-27 | 2012-04-09 | Benjamin Peterson | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 3.0 | :pep:`361` | 2008-12-03 | 2009-06-27 | Barry Warsaw | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 2.7 | :pep:`373` | 2010-07-03 | 2020-01-01 | Benjamin Peterson | -+------------------+--------------+----------------+----------------+----------------------------------+ -| 2.6 | :pep:`361` | 2008-10-01 | 2013-10-29 | Barry Warsaw | -+------------------+--------------+----------------+----------------+----------------------------------+ +.. csv-table:: + :header-rows: 1 + :width: 85% + :widths: 5, 5, 15, 12, 40 + :file: include/end-of-life.csv The latest release for each Python version can be found on the `download page `_. diff --git a/include/end-of-life.csv b/include/end-of-life.csv new file mode 100644 index 0000000000..2388d1e4be --- /dev/null +++ b/include/end-of-life.csv @@ -0,0 +1,10 @@ +Branch,Schedule,First release,End-of-life,Release manager +3.6,:pep:`494`,2016-12-23,2021-12-23,Ned Deily +3.5,:pep:`478`,2015-09-13,2020-09-30,Larry Hastings +3.4,:pep:`429`,2014-03-16,2019-03-18,Larry Hastings +3.3,:pep:`398`,2012-09-29,2017-09-29,"Georg Brandl, Ned Deily (3.3.7+)" +3.2,:pep:`392`,2011-02-20,2016-02-20,Georg Brandl +3.1,:pep:`375`,2009-06-27,2012-04-09,Benjamin Peterson +3.0,:pep:`361`,2008-12-03,2009-06-27,Barry Warsaw +2.7,:pep:`373`,2010-07-03,2020-01-01,Benjamin Peterson +2.6,:pep:`361`,2008-10-01,2013-10-29,Barry Warsaw From 2a13d982ae7352d83cbe48f41931bb2c2c3aa51c Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Mon, 4 Jul 2022 01:10:02 +0200 Subject: [PATCH 04/10] Use default ("auto") table widths. --- devcycle.rst | 2 -- index.rst | 1 - 2 files changed, 3 deletions(-) diff --git a/devcycle.rst b/devcycle.rst index 630760ae04..89ce60b37c 100644 --- a/devcycle.rst +++ b/devcycle.rst @@ -130,8 +130,6 @@ For reference, here are the Python versions that most recently reached their end .. csv-table:: :header-rows: 1 - :width: 85% - :widths: 5, 5, 15, 12, 40 :file: include/end-of-life.csv The latest release for each Python version can be found on the `download page diff --git a/index.rst b/index.rst index 71fbd51f78..beca6c3f62 100644 --- a/index.rst +++ b/index.rst @@ -96,7 +96,6 @@ Status of Python branches .. csv-table:: :header-rows: 1 - :widths: 15, 15, 15, 15, 15, 25 :file: include/branches.csv .. Update the status of the branches in include/branches.csv From 3452cf9c2127e01c8fbed8899e15dc424030079a Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 12 Jul 2022 02:47:26 +0200 Subject: [PATCH 05/10] Replace the new tables with csvs. --- versions.rst | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/versions.rst b/versions.rst index 301bdead22..a290fdf77a 100644 --- a/versions.rst +++ b/versions.rst @@ -15,35 +15,19 @@ Supported Versions Dates shown in *italic* are scheduled and can be adjusted. -====== ========== ======== ============= ============ ===================== -Branch Schedule Status First release End-of-life Release manager -====== ========== ======== ============= ============ ===================== -main TBA features *2023-10-03* *2028-10* Thomas Wouters -3.11 :pep:`664` bugfix *2022-10-03* *2027-10* Pablo Galindo Salgado -3.10 :pep:`619` bugfix 2021-10-04 *2026-10* Pablo Galindo Salgado -3.9 :pep:`596` security 2020-10-05 *2025-10* Łukasz Langa -3.8 :pep:`569` security 2019-10-14 *2024-10* Łukasz Langa -3.7 :pep:`537` security 2018-06-27 *2023-06-27* Ned Deily -====== ========== ======== ============= ============ ===================== +.. csv-table:: + :header-rows: 1 + :widths: 15, 15, 15, 15, 15, 25 + :file: include/branches.csv Unsupported versions ==================== -====== ========== =========== ============= =========== ================================ -Branch Schedule Status First release End-of-life Release manager -====== ========== =========== ============= =========== ================================ -3.6 :pep:`494` end-of-life 2016-12-23 2021-12-23 Ned Deily -3.5 :pep:`478` end-of-life 2015-09-13 2020-09-30 Larry Hastings -3.4 :pep:`429` end-of-life 2014-03-16 2019-03-18 Larry Hastings -3.3 :pep:`398` end-of-life 2012-09-29 2017-09-29 Georg Brandl, Ned Deily (3.3.7+) -3.2 :pep:`392` end-of-life 2011-02-20 2016-02-20 Georg Brandl -3.1 :pep:`375` end-of-life 2009-06-27 2012-04-09 Benjamin Peterson -3.0 :pep:`361` end-of-life 2008-12-03 2009-06-27 Barry Warsaw -2.7 :pep:`373` end-of-life 2010-07-03 2020-01-01 Benjamin Peterson -2.6 :pep:`361` end-of-life 2008-10-01 2013-10-29 Barry Warsaw -====== ========== =========== ============= =========== ================================ - +.. csv-table:: + :header-rows: 1 + :widths: 5, 5, 15, 12, 40 + :file: include/end-of-life.csv Status key ========== From 2b27597939a558f51758b688926225a823a1e802 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 12 Jul 2022 03:07:59 +0200 Subject: [PATCH 06/10] Make the tables consistent and other minor tweaks. --- include/end-of-life.csv | 20 ++++++++++---------- versions.rst | 11 +++++++---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/end-of-life.csv b/include/end-of-life.csv index 2388d1e4be..44bb3cc16b 100644 --- a/include/end-of-life.csv +++ b/include/end-of-life.csv @@ -1,10 +1,10 @@ -Branch,Schedule,First release,End-of-life,Release manager -3.6,:pep:`494`,2016-12-23,2021-12-23,Ned Deily -3.5,:pep:`478`,2015-09-13,2020-09-30,Larry Hastings -3.4,:pep:`429`,2014-03-16,2019-03-18,Larry Hastings -3.3,:pep:`398`,2012-09-29,2017-09-29,"Georg Brandl, Ned Deily (3.3.7+)" -3.2,:pep:`392`,2011-02-20,2016-02-20,Georg Brandl -3.1,:pep:`375`,2009-06-27,2012-04-09,Benjamin Peterson -3.0,:pep:`361`,2008-12-03,2009-06-27,Barry Warsaw -2.7,:pep:`373`,2010-07-03,2020-01-01,Benjamin Peterson -2.6,:pep:`361`,2008-10-01,2013-10-29,Barry Warsaw +Branch,Schedule,Status,First release,End-of-life,Release manager +3.6,:pep:`494`,end-of-life,2016-12-23,2021-12-23,Ned Deily +3.5,:pep:`478`,end-of-life,2015-09-13,2020-09-30,Larry Hastings +3.4,:pep:`429`,end-of-life,2014-03-16,2019-03-18,Larry Hastings +3.3,:pep:`398`,end-of-life,2012-09-29,2017-09-29,"Georg Brandl, Ned Deily (3.3.7+)" +3.2,:pep:`392`,end-of-life,2011-02-20,2016-02-20,Georg Brandl +3.1,:pep:`375`,end-of-life,2009-06-27,2012-04-09,Benjamin Peterson +3.0,:pep:`361`,end-of-life,2008-12-03,2009-06-27,Barry Warsaw +2.7,:pep:`373`,end-of-life,2010-07-03,2020-01-01,Benjamin Peterson +2.6,:pep:`361`,end-of-life,2008-10-01,2013-10-29,Barry Warsaw diff --git a/versions.rst b/versions.rst index a290fdf77a..c4e1b049f3 100644 --- a/versions.rst +++ b/versions.rst @@ -17,19 +17,22 @@ Dates shown in *italic* are scheduled and can be adjusted. .. csv-table:: :header-rows: 1 - :widths: 15, 15, 15, 15, 15, 25 + :widths: 5, 5, 15, 15, 12, 40 :file: include/branches.csv +.. Remember to update main branch in the paragraph above too -Unsupported versions + +Unsupported Versions ==================== .. csv-table:: :header-rows: 1 - :widths: 5, 5, 15, 12, 40 + :widths: 5, 5, 15, 15, 12, 40 :file: include/end-of-life.csv -Status key + +Status Key ========== :features: new features, bugfixes, and security fixes are accepted. From 184cbf21de6a35b8a947cb899184a98a240fb025 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Fri, 22 Jul 2022 13:59:07 +0200 Subject: [PATCH 07/10] Add 3.12 PEP. Co-authored-by: Hugo van Kemenade --- include/branches.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/branches.csv b/include/branches.csv index b8438642f3..fb51e9e4fa 100644 --- a/include/branches.csv +++ b/include/branches.csv @@ -1,5 +1,5 @@ Branch,Schedule,Status,First release,End-of-life,Release manager -main,TBA,features,*2023-10-03*,*2028-10*,Thomas Wouters +main,:pep:`693`,features,*2023-10-03*,*2028-10*,Thomas Wouters 3.11,:pep:`664`,bugfix,*2022-10-03*,*2027-10*,Pablo Galindo Salgado 3.10,:pep:`619`,bugfix,2021-10-04,*2026-10*,Pablo Galindo Salgado 3.9,:pep:`596`,security,2020-10-05,*2025-10*,Łukasz Langa From d04f4b5237563e8d0b25ccc35a317f80e19d4a28 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Thu, 10 Nov 2022 01:49:50 +0100 Subject: [PATCH 08/10] Fix 3.11 release date. Co-authored-by: C.A.M. Gerlach --- include/branches.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/branches.csv b/include/branches.csv index fb51e9e4fa..534668e0c7 100644 --- a/include/branches.csv +++ b/include/branches.csv @@ -1,6 +1,6 @@ Branch,Schedule,Status,First release,End-of-life,Release manager main,:pep:`693`,features,*2023-10-03*,*2028-10*,Thomas Wouters -3.11,:pep:`664`,bugfix,*2022-10-03*,*2027-10*,Pablo Galindo Salgado +3.11,:pep:`664`,bugfix,*2022-10-24*,*2027-10*,Pablo Galindo Salgado 3.10,:pep:`619`,bugfix,2021-10-04,*2026-10*,Pablo Galindo Salgado 3.9,:pep:`596`,security,2020-10-05,*2025-10*,Łukasz Langa 3.8,:pep:`569`,security,2019-10-14,*2024-10*,Łukasz Langa From eb442aed5ba52afca00d560d4d1faf740603918c Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Thu, 10 Nov 2022 01:51:26 +0100 Subject: [PATCH 09/10] Update release date. Co-authored-by: C.A.M. Gerlach --- include/branches.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/branches.csv b/include/branches.csv index 534668e0c7..3f0c6dc9d4 100644 --- a/include/branches.csv +++ b/include/branches.csv @@ -1,5 +1,5 @@ Branch,Schedule,Status,First release,End-of-life,Release manager -main,:pep:`693`,features,*2023-10-03*,*2028-10*,Thomas Wouters +main,:pep:`693`,features,*2023-10-02*,*2028-10*,Thomas Wouters 3.11,:pep:`664`,bugfix,*2022-10-24*,*2027-10*,Pablo Galindo Salgado 3.10,:pep:`619`,bugfix,2021-10-04,*2026-10*,Pablo Galindo Salgado 3.9,:pep:`596`,security,2020-10-05,*2025-10*,Łukasz Langa From 65f3fcf3270f5cc0660fdda1f1f16b09efd0c767 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Thu, 10 Nov 2022 01:55:05 +0100 Subject: [PATCH 10/10] Remove italic from the release date. --- include/branches.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/branches.csv b/include/branches.csv index 3f0c6dc9d4..565f0e25e6 100644 --- a/include/branches.csv +++ b/include/branches.csv @@ -1,6 +1,6 @@ Branch,Schedule,Status,First release,End-of-life,Release manager main,:pep:`693`,features,*2023-10-02*,*2028-10*,Thomas Wouters -3.11,:pep:`664`,bugfix,*2022-10-24*,*2027-10*,Pablo Galindo Salgado +3.11,:pep:`664`,bugfix,2022-10-24,*2027-10*,Pablo Galindo Salgado 3.10,:pep:`619`,bugfix,2021-10-04,*2026-10*,Pablo Galindo Salgado 3.9,:pep:`596`,security,2020-10-05,*2025-10*,Łukasz Langa 3.8,:pep:`569`,security,2019-10-14,*2024-10*,Łukasz Langa