From a56265c79da981c66598cb9d13b768021c9ac002 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 11:09:49 +0200 Subject: [PATCH 1/4] Consistently use 'minor version' for X.Y releases --- pep-0596.rst | 2 +- pep-0602.rst | 8 ++++---- pep-0605.rst | 2 +- pep-0619.rst | 2 +- pep-0664.rst | 2 +- pep-0693.rst | 2 +- pep-3147.txt | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pep-0596.rst b/pep-0596.rst index a237708d02c..740fe6bca10 100644 --- a/pep-0596.rst +++ b/pep-0596.rst @@ -38,7 +38,7 @@ Release Schedule -------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between major versions, as defined by +in a 12-month release cadence between minor versions, as defined by :pep:`602`. Actual: diff --git a/pep-0602.rst b/pep-0602.rst index 8edcd19e869..6b1a0805429 100644 --- a/pep-0602.rst +++ b/pep-0602.rst @@ -17,14 +17,14 @@ Abstract This document describes a change in the release calendar for Python starting with Python 3.9. This change accelerates the release cadence -such that major versions are released predictably every twelve months, +such that minor versions are released predictably every twelve months, in October every year. Implementation ============== -Seventeen months to develop a major version +Seventeen months to develop a minor version ------------------------------------------- This PEP proposes that Python 3.X.0 will be developed for around @@ -65,7 +65,7 @@ Annual release cadence Feature development of Python 3.(X+1).0 starts as soon as Python 3.X.0 Beta 1 is released. This creates a twelve-month delta -between major Python versions. +between minor Python versions. Example @@ -288,7 +288,7 @@ More importantly, from the perspective of the user: users. The bigger a release is feature-wise, the more potential problems are hiding in "point zero releases". -Double the release cadence to achieve 9 months between major versions +Double the release cadence to achieve 9 months between minor versions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This was originally proposed in :pep:`596` and rejected as both too diff --git a/pep-0605.rst b/pep-0605.rst index e76f1a7da9a..318f7a0cb07 100644 --- a/pep-0605.rst +++ b/pep-0605.rst @@ -645,7 +645,7 @@ additions to the stable ABI: API), and attempt to obtain further feedback that way As a slight readability and usability improvement, this PEP also proposes the -introduction of aliases for each major stable ABI version:: +introduction of aliases for each stable ABI version:: #define Py_LIMITED_API_3_3 0x03030000 #define Py_LIMITED_API_3_4 0x03040000 diff --git a/pep-0619.rst b/pep-0619.rst index 016f3742e72..adebb086925 100644 --- a/pep-0619.rst +++ b/pep-0619.rst @@ -35,7 +35,7 @@ Release Schedule --------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between major versions, as defined by +in a 12-month release cadence between minor versions, as defined by :pep:`602`. Actual: diff --git a/pep-0664.rst b/pep-0664.rst index 04980a1016d..5d1131f24be 100644 --- a/pep-0664.rst +++ b/pep-0664.rst @@ -38,7 +38,7 @@ Release Schedule --------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between major versions, as defined by +in a 12-month release cadence between minor versions, as defined by :pep:`602`. Actual: diff --git a/pep-0693.rst b/pep-0693.rst index 03fc79a2427..07a49b02f4f 100644 --- a/pep-0693.rst +++ b/pep-0693.rst @@ -37,7 +37,7 @@ Release Schedule --------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between major versions, as defined by +in a 12-month release cadence between minor versions, as defined by :pep:`602`. Actual: diff --git a/pep-3147.txt b/pep-3147.txt index e8c5a303df6..1a5ec4fdee4 100644 --- a/pep-3147.txt +++ b/pep-3147.txt @@ -46,8 +46,8 @@ it. When either the magic number or timestamp do not match, the py file is recompiled and a new pyc file is written. In practice, it is well known that pyc files are not compatible across -Python major releases. A reading of import.c [3]_ in the Python -source code proves that within recent memory, every new CPython major +Python minor releases. A reading of import.c [3]_ in the Python +source code proves that within recent memory, every new CPython minor release has bumped the pyc magic number. From dc79252cf11d0b161e1522a2e26b5826d7ab60ee Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 13:47:05 +0200 Subject: [PATCH 2/4] Revert changes in PEP-605 and PEP-3147 --- pep-0605.rst | 2 +- pep-3147.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pep-0605.rst b/pep-0605.rst index 318f7a0cb07..e76f1a7da9a 100644 --- a/pep-0605.rst +++ b/pep-0605.rst @@ -645,7 +645,7 @@ additions to the stable ABI: API), and attempt to obtain further feedback that way As a slight readability and usability improvement, this PEP also proposes the -introduction of aliases for each stable ABI version:: +introduction of aliases for each major stable ABI version:: #define Py_LIMITED_API_3_3 0x03030000 #define Py_LIMITED_API_3_4 0x03040000 diff --git a/pep-3147.txt b/pep-3147.txt index 1a5ec4fdee4..e8c5a303df6 100644 --- a/pep-3147.txt +++ b/pep-3147.txt @@ -46,8 +46,8 @@ it. When either the magic number or timestamp do not match, the py file is recompiled and a new pyc file is written. In practice, it is well known that pyc files are not compatible across -Python minor releases. A reading of import.c [3]_ in the Python -source code proves that within recent memory, every new CPython minor +Python major releases. A reading of import.c [3]_ in the Python +source code proves that within recent memory, every new CPython major release has bumped the pyc magic number. From 4d58ddb99b45869da75cb642aab7e145f5d7f089 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 17 Jun 2023 10:19:41 +0200 Subject: [PATCH 3/4] Address CAM's review: instead, use the established term 'feature version' --- pep-0596.rst | 2 +- pep-0602.rst | 12 ++++++------ pep-0619.rst | 2 +- pep-0664.rst | 2 +- pep-0693.rst | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pep-0596.rst b/pep-0596.rst index 740fe6bca10..7337f38265d 100644 --- a/pep-0596.rst +++ b/pep-0596.rst @@ -38,7 +38,7 @@ Release Schedule -------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between minor versions, as defined by +in a 12-month release cadence between feature versions, as defined by :pep:`602`. Actual: diff --git a/pep-0602.rst b/pep-0602.rst index 6b1a0805429..8ee274cf77b 100644 --- a/pep-0602.rst +++ b/pep-0602.rst @@ -17,15 +17,15 @@ Abstract This document describes a change in the release calendar for Python starting with Python 3.9. This change accelerates the release cadence -such that minor versions are released predictably every twelve months, +such that feature versions are released predictably every twelve months, in October every year. Implementation ============== -Seventeen months to develop a minor version -------------------------------------------- +Seventeen months to develop a feature version +--------------------------------------------- This PEP proposes that Python 3.X.0 will be developed for around 17 months: @@ -65,7 +65,7 @@ Annual release cadence Feature development of Python 3.(X+1).0 starts as soon as Python 3.X.0 Beta 1 is released. This creates a twelve-month delta -between minor Python versions. +between feature Python versions. Example @@ -288,8 +288,8 @@ More importantly, from the perspective of the user: users. The bigger a release is feature-wise, the more potential problems are hiding in "point zero releases". -Double the release cadence to achieve 9 months between minor versions -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Double the release cadence to achieve 9 months between feature versions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This was originally proposed in :pep:`596` and rejected as both too irregular and too short. This would not give any of the benefits of diff --git a/pep-0619.rst b/pep-0619.rst index adebb086925..d34fccb9083 100644 --- a/pep-0619.rst +++ b/pep-0619.rst @@ -35,7 +35,7 @@ Release Schedule --------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between minor versions, as defined by +in a 12-month release cadence between feature versions, as defined by :pep:`602`. Actual: diff --git a/pep-0664.rst b/pep-0664.rst index 5d1131f24be..db956d40366 100644 --- a/pep-0664.rst +++ b/pep-0664.rst @@ -38,7 +38,7 @@ Release Schedule --------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between minor versions, as defined by +in a 12-month release cadence between feature versions, as defined by :pep:`602`. Actual: diff --git a/pep-0693.rst b/pep-0693.rst index 07a49b02f4f..61a78220035 100644 --- a/pep-0693.rst +++ b/pep-0693.rst @@ -37,7 +37,7 @@ Release Schedule --------------- Note: the dates below use a 17-month development period that results -in a 12-month release cadence between minor versions, as defined by +in a 12-month release cadence between feature versions, as defined by :pep:`602`. Actual: From 607839d9c49b4e884c7ca610a2e7607020d0b4cd Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sun, 18 Jun 2023 01:33:41 +0200 Subject: [PATCH 4/4] Update pep-0602.rst Co-authored-by: C.A.M. Gerlach --- pep-0602.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pep-0602.rst b/pep-0602.rst index 8ee274cf77b..2cbf8c29ce4 100644 --- a/pep-0602.rst +++ b/pep-0602.rst @@ -65,7 +65,7 @@ Annual release cadence Feature development of Python 3.(X+1).0 starts as soon as Python 3.X.0 Beta 1 is released. This creates a twelve-month delta -between feature Python versions. +between Python feature versions. Example