summaryrefslogtreecommitdiff
path: root/docs/narr/upgrading.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-11-26 23:59:40 -0800
committerSteve Piercy <web@stevepiercy.com>2018-11-26 23:59:40 -0800
commit2615104ce4ba383a46df3c27ba26cfb86654e116 (patch)
treead938e23efd1be67821ddfb710748e746c92c420 /docs/narr/upgrading.rst
parent28f24e7592fc5a7fd28874e9a350f80674583471 (diff)
parent587fe72fae0efda3a860d37a1ea2449a41dab622 (diff)
downloadpyramid-2615104ce4ba383a46df3c27ba26cfb86654e116.tar.gz
pyramid-2615104ce4ba383a46df3c27ba26cfb86654e116.tar.bz2
pyramid-2615104ce4ba383a46df3c27ba26cfb86654e116.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/narr/upgrading.rst')
-rw-r--r--docs/narr/upgrading.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 12e146cf1..87e4647c3 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -86,7 +86,6 @@ 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 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.