summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2022-02-05 20:21:51 -0700
committerBert JW Regeer <bertjw@regeer.org>2022-02-05 20:22:13 -0700
commitf6806a7dcad98534f80b4e8092817b15c27a898e (patch)
tree7a4c3a6a686af85b7f9a5a6706a7bbdc926b4027 /docs/narr
parente9b1cab2d99516352d8b7692c0b0c2fb8a81d221 (diff)
downloadpyramid-f6806a7dcad98534f80b4e8092817b15c27a898e.tar.gz
pyramid-f6806a7dcad98534f80b4e8092817b15c27a898e.tar.bz2
pyramid-f6806a7dcad98534f80b4e8092817b15c27a898e.zip
Cleanup remnants of Py3.6 support
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/install.rst7
-rw-r--r--docs/narr/upgrading.rst6
2 files changed, 7 insertions, 6 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 078209e26..882b40d10 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -5,7 +5,7 @@ Installing :app:`Pyramid`
.. note::
- This installation guide emphasizes the use of Python 3.6 and greater for
+ This installation guide emphasizes the use of Python 3.7 and greater for
simplicity.
@@ -15,13 +15,14 @@ Installing :app:`Pyramid`
Before You Install Pyramid
--------------------------
-Install Python version 3.6 or greater for your operating system, and satisfy
+Install Python version 3.7 or greater for your operating system, and satisfy
the :ref:`requirements-for-installing-packages`, as described in
the following sections.
.. sidebar:: Python Versions
- As of this writing, :app:`Pyramid` is tested against Python 3.7, 3.8, 3.9, and 3.10 and PyPy3.
+ As of this writing, :app:`Pyramid` is tested against Python 3.7, 3.8, 3.9,
+ and 3.10 and PyPy (matches CPython version 3.8).
:app:`Pyramid` is known to run on all popular Unix-like systems such as Linux,
macOS, and FreeBSD, as well as on Windows platforms. It is also known to
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index d6882809a..020f2ed37 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -86,10 +86,10 @@ 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.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.
-- `Python 3.8 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2024-10-??.
-- `Python 3.9 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ TBD.
+- `Python 3.8 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2024-10.
+- `Python 3.9 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2025-10.
+- `Python 3.10 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2026-10.
To determine the Python support for a specific release of Pyramid, view its
``tox.ini`` file at the root of the repository's version.