summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-09 00:15:29 -0700
committerGitHub <noreply@github.com>2018-10-09 00:15:29 -0700
commit045951c2160c3431a319c9e662c34a6685cab007 (patch)
tree10056ce6d861b8ff63daf007faf917563b1bb4c2 /docs
parent410a11a1d448c772ca1a5a4ec4a3946e0f88d20a (diff)
parentc5b438fc13297f6898b7b64b6d9bd200f524390d (diff)
downloadpyramid-045951c2160c3431a319c9e662c34a6685cab007.tar.gz
pyramid-045951c2160c3431a319c9e662c34a6685cab007.tar.bz2
pyramid-045951c2160c3431a319c9e662c34a6685cab007.zip
Merge pull request #3382 from stevepiercy/docs-upgrade-policy
Add 2.7 and 3.7 EOL, update link to definitive source of EOL dates.
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/upgrading.rst13
1 files changed, 5 insertions, 8 deletions
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 2ca162c46..07f955de8 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -83,14 +83,11 @@ At the time of a Pyramid version release, each supports all versions of Python
through the end of their lifespans. The end-of-life for a given version of
Python is when security updates are no longer released.
-- `Python 3.2 Lifespan <https://www.python.org/dev/peps/pep-0392/#lifespan>`_
- ends February 2016.
-- `Python 3.3 Lifespan <https://www.python.org/dev/peps/pep-0392/#lifespan>`_
- ends September 2017.
-- `Python 3.4 Lifespan <https://www.python.org/dev/peps/pep-0429/>`_ TBD.
-- `Python 3.5 Lifespan <https://www.python.org/dev/peps/pep-0478/>`_ TBD.
-- `Python 3.6 Lifespan <https://www.python.org/dev/peps/pep-0494/#id4>`_
- December 2021.
+- `Python 2.7 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2020-01-01.
+- `Python 3.4 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2019-03-16 .
+- `Python 3.5 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2020-09-13 .
+- `Python 3.6 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2021-12-23.
+- `Python 3.7 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2023-06-27 .
To determine the Python support for a specific release of Pyramid, view its
``tox.ini`` file at the root of the repository's version.