summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-08-22 11:18:03 -0700
committerGitHub <noreply@github.com>2018-08-22 11:18:03 -0700
commit943fc924ef5864d04ec4b8eb6c94761763976ae6 (patch)
tree4c902c1af968728b0a27918f5c793d3d814aea5b /docs
parentf1cea823ada61213be36007b888534558e215f86 (diff)
parent1c44d2b9032dc145140cfc74f1a97d316931244b (diff)
downloadpyramid-943fc924ef5864d04ec4b8eb6c94761763976ae6.tar.gz
pyramid-943fc924ef5864d04ec4b8eb6c94761763976ae6.tar.bz2
pyramid-943fc924ef5864d04ec4b8eb6c94761763976ae6.zip
Merge pull request #3333 from stevepiercy/python-version-bump
Add support for Python 3.7 and 3.8 with allowed failure of 3.8
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst2
-rw-r--r--docs/quick_tour.rst2
-rw-r--r--docs/quick_tutorial/requirements.rst6
-rw-r--r--docs/tutorials/wiki/installation.rst2
-rw-r--r--docs/tutorials/wiki2/installation.rst2
5 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 80d5ea3de..743cb4abb 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -22,7 +22,7 @@ the following sections.
.. sidebar:: Python Versions
As of this writing, :app:`Pyramid` is tested against Python 2.7,
- Python 3.4, Python 3.5, Python 3.6, and PyPy.
+ Python 3.4, Python 3.5, Python 3.6, Python 3.7, and PyPy.
: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/quick_tour.rst b/docs/quick_tour.rst
index 922ffd652..c61cbfdfd 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -26,7 +26,7 @@ To save a little bit of typing and to be certain that we use the modules,
scripts, and packages installed in our virtual environment, we'll set an
environment variable, too.
-As an example, for Python 3.6+ on Linux:
+As an example, for Python 3 on Linux:
.. parsed-literal::
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 08ea93cb2..a74c07673 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -19,11 +19,11 @@ virtual environment.)
This *Quick Tutorial* is based on:
-* **Python 3.6**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
- tutorial uses **Python 3.6** but runs fine under Python 2.7.
+* **Python 3.7**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
+ tutorial uses **Python 3.7** but runs fine under Python 2.7.
* **venv**. We believe in virtual environments. For this tutorial, we use
- Python 3.6's built-in solution :term:`venv`. For Python 2.7, you can install
+ Python 3's built-in solution :term:`venv`. For Python 2.7, you can install
:term:`virtualenv`.
* **pip**. We use :term:`pip` for package management.
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 71fd0a957..7f914267f 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -111,7 +111,7 @@ Python 2.7:
c:\Python27\Scripts\virtualenv %VENV%
-Python 3.6:
+Python 3.7:
.. code-block:: doscon
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 1fa7e21d7..5f2c6d44e 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -123,7 +123,7 @@ Python 2.7:
c:\Python27\Scripts\virtualenv %VENV%
-Python 3.6:
+Python 3.7:
.. code-block:: doscon