From 5e7f4e10f45e78afe04e18c9f904aebff2d9d6b4 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 15 Dec 2019 20:24:56 -0600 Subject: set the minimum supported version at py36 --- .travis.yml | 10 ++-------- HACKING.txt | 5 ++--- appveyor.yml | 10 ++++------ setup.py | 2 +- tox.ini | 2 +- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4860d2de..550c79611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,17 +4,13 @@ sudo: false matrix: include: - - python: 3.4 - env: TOXENV=py34 - - python: 3.5 - env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - python: pypy3 env: TOXENV=pypy3 - python: 3.6 env: TOXENV=py36-cover,coverage - - python: 3.5 + - python: 3.6 env: TOXENV=docs - python: 3.6 env: TOXENV=lint @@ -22,12 +18,10 @@ matrix: env: TOXENV=py37 dist: xenial sudo: true - - python: 3.8-dev + - python: 3.8 env: TOXENV=py38 dist: xenial sudo: true - allow_failures: - - env: TOXENV=py38 install: - travis_retry pip install tox diff --git a/HACKING.txt b/HACKING.txt index 5ccc318de..fbfd0ecd0 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -34,8 +34,7 @@ In order to add a feature to Pyramid: - The feature must be documented in both the API and narrative documentation (in `docs/`). -- The feature must work fully on the following CPython versions: 3.4, 3.5, 3.6, - and 3.7 on both UNIX and Windows. +- The feature must work fully on the following CPython versions: 3.6, 3.7, and 3.8 on both UNIX and Windows. - The feature must work on the latest version of PyPy3. @@ -67,7 +66,7 @@ Running Tests This command will run tests on the latest version of Python 3 with coverage. - $ tox -e py3-cover,coverage + $ tox -e py36-cover,coverage - To run individual tests (i.e., during development), you can use `nosetests` syntax as follows, where `$VENV` is an environment variable set to the path diff --git a/appveyor.yml b/appveyor.yml index a9bcd40f1..d0d22146d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,11 @@ environment: matrix: - - PYTHON: "C:\\Python37" - TOXENV: "py37" - PYTHON: "C:\\Python36" TOXENV: "py36" - - PYTHON: "C:\\Python35" - TOXENV: "py35" - - PYTHON: "C:\\Python34" - TOXENV: "py34" + - PYTHON: "C:\\Python37" + TOXENV: "py37" + - PYTHON: "C:\\Python38" + TOXENV: "py38" cache: - '%LOCALAPPDATA%\pip\Cache' diff --git a/setup.py b/setup.py index 4db78d158..189f0700f 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ setup( package_dir={'': 'src'}, include_package_data=True, zip_safe=False, - python_requires='>=3.4', + python_requires='>=3.6', install_requires=install_requires, extras_require={'testing': testing_extras, 'docs': docs_extras}, tests_require=tests_require, diff --git a/tox.ini b/tox.ini index 441a118a8..34eb11317 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint, - py34,py35,py36,py37,pypy3, + py36,py37,pypy3, docs,py36-cover,coverage, [testenv] -- cgit v1.2.3 From 3f42e5f2c848e69f282337f6fbf56e69b295b58e Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 15 Dec 2019 23:14:19 -0800 Subject: Remove Python 3.4, Python 3.5, and add Python 3.8 --- docs/narr/install.rst | 6 +++--- docs/narr/logging.rst | 2 +- docs/narr/upgrading.rst | 6 +++--- docs/quick_tutorial/requirements.rst | 4 ++-- docs/tutorials/modwsgi/index.rst | 2 +- docs/tutorials/wiki/installation.rst | 2 -- docs/tutorials/wiki/tests.rst | 3 --- setup.py | 3 +-- 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 268ae5f8d..903769b59 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.4 and greater for + This installation guide emphasizes the use of Python 3.6 and greater for simplicity. @@ -15,13 +15,13 @@ Installing :app:`Pyramid` Before You Install Pyramid -------------------------- -Install Python version 3.4 or greater for your operating system, and satisfy +Install Python version 3.6 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.4, Python 3.5, Python 3.6, Python 3.7, Python 3.8 (with allowed failures), and PyPy3. + As of this writing, :app:`Pyramid` is tested against Python 3.6, Python 3.7, Python 3.8, and PyPy3. :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/logging.rst b/docs/narr/logging.rst index 58bd2d4ec..844128758 100644 --- a/docs/narr/logging.rst +++ b/docs/narr/logging.rst @@ -32,7 +32,7 @@ you to send messages to :mod:`Python standard library logging package :term:`PasteDeploy` ``development.ini`` and ``production.ini`` files created when you use our cookiecutter include a basic configuration for the Python :mod:`logging` package. -These ``.ini`` file sections are passed to the `logging module's config file configuration engine `_. +These ``.ini`` file sections are passed to the `logging module's config file configuration engine `_. PasteDeploy ``.ini`` files use the Python standard library :mod:`ConfigParser format `. This is the same format used as the Python diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst index af552741c..31ca6adfa 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.4 Lifespan `_ 2019-03-16 . -- `Python 3.5 Lifespan `_ 2020-09-13 . +- `Python 3.5 Lifespan `_ 2020-09-13. - `Python 3.6 Lifespan `_ 2021-12-23. -- `Python 3.7 Lifespan `_ 2023-06-27 . +- `Python 3.7 Lifespan `_ 2023-06-27. +- `Python 3.8 Lifespan `_ 2024-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. diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index 2ed9b8b55..901f6134d 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -19,8 +19,8 @@ virtual environment.) This *Quick Tutorial* is based on: -* **Python 3.7**. Pyramid fully supports Python 3.4+. - This tutorial uses **Python 3.7**. +* **Python 3.8**. Pyramid fully supports Python 3.6+. + This tutorial uses **Python 3.8**. * **venv**. We believe in virtual environments. For this tutorial, we use Python 3's built-in solution :term:`venv`. diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst index fa0d4f0cb..be72c014c 100644 --- a/docs/tutorials/modwsgi/index.rst +++ b/docs/tutorials/modwsgi/index.rst @@ -117,7 +117,7 @@ specific path information for commands and files. WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On WSGIDaemonProcess pyramid user=chrism group=staff threads=4 \ - python-path=/Users/chrism/myproject/env/lib/python3.5/site-packages + python-path=/Users/chrism/myproject/env/lib/python3.8/site-packages WSGIScriptAlias /myapp /Users/chrism/myproject/pyramid.wsgi diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst index 37e3498b2..cfa021540 100644 --- a/docs/tutorials/wiki/installation.rst +++ b/docs/tutorials/wiki/installation.rst @@ -127,8 +127,6 @@ On Unix On Windows ^^^^^^^^^^ -Python 3.7: - .. code-block:: doscon python -m venv %VENV% diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst index a0872e605..9dacc5f96 100644 --- a/docs/tutorials/wiki/tests.rst +++ b/docs/tutorials/wiki/tests.rst @@ -73,6 +73,3 @@ The expected result should look like the following: ......................... 25 passed in 6.87 seconds - -If you use Python 3.7, you may see deprecation warnings from the docutils 0.14 package. -You can apply a [patch](https://sourceforge.net/p/docutils/patches/144/) to fix the issue, or ignore it and wait for the next release of docutils. diff --git a/setup.py b/setup.py index 189f0700f..02abf6471 100644 --- a/setup.py +++ b/setup.py @@ -69,10 +69,9 @@ setup( "Intended Audience :: Developers", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", -- cgit v1.2.3 From 4ec93ffe23cbf3acbbfc68236696ee474ddf73ba Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 23 Dec 2019 11:56:55 -0600 Subject: Update tox.ini Co-Authored-By: Steve Piercy --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 34eb11317..f2a2b7243 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint, - py36,py37,pypy3, + py36,py37,py38,pypy3, docs,py36-cover,coverage, [testenv] -- cgit v1.2.3 From e268aa622f57fd76b06fc6203448143f4fbe7652 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 23 Dec 2019 12:08:50 -0600 Subject: restore py35 --- .travis.yml | 2 ++ HACKING.txt | 2 +- appveyor.yml | 2 ++ docs/narr/install.rst | 6 +++--- docs/quick_tutorial/requirements.rst | 2 +- setup.py | 3 ++- tox.ini | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 550c79611..c762c085b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ sudo: false matrix: include: + - python: 3.5 + env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - python: pypy3 diff --git a/HACKING.txt b/HACKING.txt index fbfd0ecd0..492b8675b 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -34,7 +34,7 @@ In order to add a feature to Pyramid: - The feature must be documented in both the API and narrative documentation (in `docs/`). -- The feature must work fully on the following CPython versions: 3.6, 3.7, and 3.8 on both UNIX and Windows. +- The feature must work fully on the following CPython versions: 3.5, 3.6, 3.7, and 3.8 on both UNIX and Windows. - The feature must work on the latest version of PyPy3. diff --git a/appveyor.yml b/appveyor.yml index d0d22146d..ba07274f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,7 @@ environment: matrix: + - PYTHON: "C:\\Python35" + TOXENV: "py35" - PYTHON: "C:\\Python36" TOXENV: "py36" - PYTHON: "C:\\Python37" diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 903769b59..8e2bfa866 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.5 and greater for simplicity. @@ -15,13 +15,13 @@ Installing :app:`Pyramid` Before You Install Pyramid -------------------------- -Install Python version 3.6 or greater for your operating system, and satisfy +Install Python version 3.5 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.6, Python 3.7, Python 3.8, and PyPy3. + As of this writing, :app:`Pyramid` is tested against Python 3.5, 3.6, Python 3.7, Python 3.8, and PyPy3. :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_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index 901f6134d..fd1726dbd 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -19,7 +19,7 @@ virtual environment.) This *Quick Tutorial* is based on: -* **Python 3.8**. Pyramid fully supports Python 3.6+. +* **Python 3.8**. Pyramid fully supports Python 3.5+. This tutorial uses **Python 3.8**. * **venv**. We believe in virtual environments. diff --git a/setup.py b/setup.py index 02abf6471..2487d0952 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,7 @@ setup( "Intended Audience :: Developers", "Programming Language :: Python", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", @@ -93,7 +94,7 @@ setup( package_dir={'': 'src'}, include_package_data=True, zip_safe=False, - python_requires='>=3.6', + python_requires='>=3.5', install_requires=install_requires, extras_require={'testing': testing_extras, 'docs': docs_extras}, tests_require=tests_require, diff --git a/tox.ini b/tox.ini index f2a2b7243..1d68122f4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint, - py36,py37,py38,pypy3, + py35,py36,py37,py38,pypy3, docs,py36-cover,coverage, [testenv] -- cgit v1.2.3