Update devguide info about active branches and tags.

ned-deily · ned-deily · commit 3b1dfec32200 · 2017-10-06T17:44:39.000-04:00
Document release tag formats and describe how end-of-life
release cycles are represented in the repo as a read-only
tag rather than as a branch.
diff --git a/devcycle.rst b/devcycle.rst
@@ -46,7 +46,7 @@ changes, performance improvements, bug fixes.
 
 At some point during the life-cycle of a release, a
 new :ref:`maintenance branch <maintbranch>` is created to host all bug fixing
-activity for further micro versions in a feature version (3.3.1, 3.3.2, etc.).
+activity for further micro versions in a feature version (3.6.1, 3.6.2, etc.).
 
 For versions 3.4 and before, this was conventionally done when the final
 release was cut (for example, 3.4.0 final).
@@ -110,7 +110,7 @@ security patches have been applied to the branch.
 Summary
 -------
 
-There are 6 open branches right now in the Git repository:
+There are 5 open branches right now in the Git repository:
 
 - the ``master`` branch accepts features and bugs fixes for the future
   3.7.0 feature release (RM: Ned Deily)
@@ -120,8 +120,6 @@ There are 6 open branches right now in the Git repository:
   (RM: Larry Hastings)
 - the ``3.4`` branch accepts security fixes for future 3.4.x security releases
   (RM: Larry Hastings)
-- the ``3.3`` branch accepts security fixes for future 3.3.x security releases
-  (RM: Georg Brandl) [end-of-life for 3.3 is 2017-09-29]
 - the ``2.7`` branch accepts bug fixes for future 2.7.x maintenance releases
   (RM: Benjamin Peterson)
 
diff --git a/index.rst b/index.rst
@@ -102,21 +102,6 @@ Status of Python branches
 | 3.4              | :pep:`429`   | security    | 2014-03-16     | *2019-03-16*   | `Most recent security release: Python 3.4.7                                |
 |                  |              |             |                |                | <https://www.python.org/downloads/release/python-347/>`_                   |
 +------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
-| 3.3              | :pep:`398`   | end-of-life | 2012-09-29     | 2017-09-29     | `Final release: Python 3.3.7                                               |
-|                  |              |             |                |                | <https://www.python.org/downloads/release/python-337/>`_                   |
-+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
-| 3.2              | :pep:`392`   | end-of-life | 2011-02-20     | 2016-02-20     | `Final release: Python 3.2.6                                               |
-|                  |              |             |                |                | <https://www.python.org/downloads/release/python-326/>`_                   |
-+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
-| 3.1              | :pep:`375`   | end-of-life | 2009-06-27     | 2012-04-11     | `Final release: Python 3.1.5                                               |
-|                  |              |             |                |                | <https://www.python.org/downloads/release/python-315/>`_                   |
-+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
-| 3.0              | :pep:`361`   | end-of-life | 2008-12-03     | 2009-01-13     | `Final release: Python 3.0.1                                               |
-|                  |              |             |                |                | <https://www.python.org/download/releases/3.0.1/>`_                        |
-+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
-| 2.6              | :pep:`361`   | end-of-life | 2008-10-01     | 2013-10-29     | `Final release: Python 2.6.9                                               |
-|                  |              |             |                |                | <https://www.python.org/download/releases/2.6.9/>`_                        |
-+------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
 
 (1) The exact date of Python 2.7 end-of-life has not been decided yet. It will
 be decided by Python 2.7 release manager, Benjamin Peterson, who will update
@@ -132,8 +117,7 @@ Status:
     released.
 :security: only security fixes are accepted and no more binaries are released,
     but new source-only versions can be released
-:end-of-life: branch no longer maintained; no more changes can be pushed to
-    this branch.
+:end-of-life: release cycle is frozen; no further changes can be pushed to it.
 
 Dates in *italic* are scheduled and can be adjusted.
 
@@ -143,6 +127,37 @@ have reached end-of-life.
 
 See also :ref:`Security branches <secbranch>`.
 
+Each release of Python is tagged in the source repo with a tag of the form
+``vX.Y.ZTN``, where ``X`` is the major version, ``Y`` is the
+minor version, ``Z`` is the micro version, ``T`` is the release level
+(``a`` for alpha releases, ``b`` for beta, ``rc`` release candidate,
+and *null* for final releases), and ``N`` is the release serial number.
+Some examples of release tags: ``v3.7.0a1``, ``v3.6.3``, ``v2.7.14rc1``.
+
+The code base for a release cycle which has reached end-of-life status
+is frozen and no longer has a branch in the repo.  The final state of
+the end-of-lifed branch is recorded as a tag with the same name as the
+former branch, e.g. ``3.3`` or ``2.6``.  For reference, here are the
+most recently end-of-lifed release cycles:
+
++------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
+| Tag              | Schedule     | Status      | First release  | End-of-life    | Comment                                                                    |
++==================+==============+=============+================+================+============================================================================+
+| 3.3              | :pep:`398`   | end-of-life | 2012-09-29     | 2017-09-29     | `Final release: Python 3.3.7                                               |
+|                  |              |             |                |                | <https://www.python.org/downloads/release/python-337/>`_                   |
++------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
+| 3.2              | :pep:`392`   | end-of-life | 2011-02-20     | 2016-02-20     | `Final release: Python 3.2.6                                               |
+|                  |              |             |                |                | <https://www.python.org/downloads/release/python-326/>`_                   |
++------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
+| 3.1              | :pep:`375`   | end-of-life | 2009-06-27     | 2012-04-11     | `Final release: Python 3.1.5                                               |
+|                  |              |             |                |                | <https://www.python.org/downloads/release/python-315/>`_                   |
++------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
+| 3.0              | :pep:`361`   | end-of-life | 2008-12-03     | 2009-01-13     | `Final release: Python 3.0.1                                               |
+|                  |              |             |                |                | <https://www.python.org/download/releases/3.0.1/>`_                        |
++------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
+| 2.6              | :pep:`361`   | end-of-life | 2008-10-01     | 2013-10-29     | `Final release: Python 2.6.9                                               |
+|                  |              |             |                |                | <https://www.python.org/download/releases/2.6.9/>`_                        |
++------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
 
 .. _contributing:
 
diff --git a/triaging.rst b/triaging.rst
@@ -121,9 +121,9 @@ XML
 Versions
 ''''''''
 The known versions of Python that the issue affects and should be fixed for.
-Thus if an issue for a new feature is assigned for e.g., Python 3.3 but is not
-applied before Python 3.3.0 is released, this field should be updated to say
-Python 3.4 as the version and drop Python 3.3.
+Thus if an issue for a new feature is assigned for e.g., Python 3.7 but is not
+applied before Python 3.7.0 is released, this field should be updated to say
+Python 3.8 as the version and drop Python 3.7.
 
 Priority
 ''''''''
