Skip to content

Commit b0ed3bd

Browse files
committed
Updates for 3.7 feature code freeze
1 parent 5c6604f commit b0ed3bd

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

devcycle.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,11 @@ security patches have been applied to the branch.
110110
Summary
111111
-------
112112

113-
There are 5 open branches right now in the Git repository:
113+
There are 6 open branches right now in the Git repository:
114114

115115
- the ``master`` branch accepts features and bugs fixes for the future
116+
3.8.0 feature release (RM: Łukasz Langa)
117+
- the ``3.7`` branch accepts bug, regression, and doc fixes for the upcoming
116118
3.7.0 feature release (RM: Ned Deily)
117119
- the ``3.6`` branch accepts bug fixes for future 3.6.x maintenance releases
118120
(RM: Ned Deily)

index.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ Status of Python branches
9191
+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
9292
| Branch | Schedule | Status | First release | End-of-life | Comment |
9393
+==================+==============+=============+================+================+============================================================================+
94-
| master | :pep:`537` | features | *2018-06-15* | *2023-06-15* | The master branch is currently the future version Python 3.7. |
94+
| master | :pep:`569` | features | *2019-10-20* | *2024-10* | The master branch is currently the future Python 3.8. |
95+
+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
96+
| 3.7 | :pep:`537` | prerelease | *2018-06-15* | *2023-06* | Fixes for features, bugs, and docs in the upcoming 3.7.0 release |
9597
+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
9698
| 3.6 | :pep:`494` | bugfix | 2016-12-23 | *2021-12-23* | `Most recent binary release: Python 3.6.4 |
9799
| | | | | | <https://www.python.org/downloads/release/python-364/>`_ |
@@ -117,6 +119,8 @@ Status:
117119

118120
:features: new features are only added to the master branch, this branch
119121
accepts any kind of change.
122+
:prerelease: feature fixes, bugfixes and security fixes are accepted for the
123+
upcoming feature release.
120124
:bugfix: bugfixes and security fixes are accepted, new binaries are still
121125
released.
122126
:security: only security fixes are accepted and no more binaries are released,

0 commit comments

Comments
 (0)