From e259f1e5131bcafd3a1a88ac604e45330d61e382 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 22 Aug 2018 05:39:13 -0700 Subject: Add support for Python 3.7 and 3.8 with allowed failure of 3.8 --- .travis.yml | 8 ++++++-- tox.ini | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9884c3d19..30e7e5b79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,14 @@ matrix: env: TOXENV=docs - python: 3.5 env: TOXENV=lint - - python: nightly + - python: 3.7 env: TOXENV=py37 + dist: xenial + sudo: true + - python: nightly + env: TOXENV=py38 allow_failures: - - env: TOXENV=py37 + - env: TOXENV=py38 install: - travis_retry pip install tox diff --git a/tox.ini b/tox.ini index 758d4216b..5a73bc426 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint, - py27,py34,py35,py36,pypy,pypy3, + py27,py34,py35,py36,py37,py38,pypy,pypy3, docs,{py2,py3}-cover,coverage, [testenv] @@ -13,6 +13,7 @@ basepython = py35: python3.5 py36: python3.6 py37: python3.7 + py38: python3.8 pypy: pypy pypy3: pypy3 py2: python2.7 @@ -48,6 +49,12 @@ commands = python pyramid/scaffolds/tests.py deps = virtualenv +[testenv:py37-scaffolds] +basepython = python3.7 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + [testenv:pypy-scaffolds] basepython = pypy commands = -- cgit v1.2.3 From 78464987e8e3cb2188253783d9968ae4d86669d9 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 22 Aug 2018 05:41:22 -0700 Subject: Add support for Python 3.7 in Appveyor --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index abbbfea92..f3ea0b8bd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,7 @@ environment: matrix: + - PYTHON: "C:\\Python37" + TOXENV: "py37" - PYTHON: "C:\\Python36" TOXENV: "py36" - PYTHON: "C:\\Python35" -- cgit v1.2.3 From 4820757eedd6812c800841029253f40c643c389f Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 22 Aug 2018 05:56:04 -0700 Subject: Bump Python version to 3.7 in docs and project meta files --- CHANGES.rst | 3 +++ HACKING.txt | 4 ++-- RELEASING.txt | 4 ++-- docs/narr/install.rst | 2 +- docs/quick_tour.rst | 2 +- docs/quick_tutorial/requirements.rst | 6 +++--- docs/tutorials/wiki/installation.rst | 2 +- docs/tutorials/wiki2/installation.rst | 2 +- scaffoldtests.sh | 2 +- setup.py | 1 + 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9bfa80f05..6010a148d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -54,6 +54,9 @@ Features available within the user-defined ``setup`` function. See https://github.com/Pylons/pyramid/pull/3318 +- Add support for Python 3.7. Add testing on Python 3.8 with allowed failures. + See https://github.com/Pylons/pyramid/pull/3333 + Bug Fixes --------- diff --git a/HACKING.txt b/HACKING.txt index 8ec44605c..3a7774781 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -114,7 +114,7 @@ In order to add a feature to Pyramid: (in ``docs/``). - The feature must work fully on the following CPython versions: 2.7, 3.4, 3.5, - and 3.6 on both UNIX and Windows. + 3.6, and 3.7 on both UNIX and Windows. - The feature must work on the latest version of PyPy. @@ -211,7 +211,7 @@ Running Tests Alternatively: - $ tox -e{py27,py34,py35,pypy}-scaffolds + $ tox -e{py27,py34,py35,pyt36,py37,pypy}-scaffolds Test Coverage diff --git a/RELEASING.txt b/RELEASING.txt index bec140309..b6603c597 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -33,8 +33,8 @@ Prepare new release branch - Run tests on Windows if feasible. -- Make sure all scaffold tests pass (CPython 2.7, 3.4, 3.5, and 3.6, and PyPy - on UNIX; this doesn't work on Windows): +- Make sure all scaffold tests pass (CPython 2.7, 3.4, 3.5, 3.6, and 3.7, and + PyPy on UNIX; this doesn't work on Windows): $ ./scaffoldtests.sh 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..265f67a4f 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.7+ on Linux: .. parsed-literal:: diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index 08ea93cb2..1d5395138 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.7'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 diff --git a/scaffoldtests.sh b/scaffoldtests.sh index 317bff8b5..fd243e8b2 100755 --- a/scaffoldtests.sh +++ b/scaffoldtests.sh @@ -1,2 +1,2 @@ #!/bin/bash -tox -e{py27,py34,py35,pypy}-scaffolds, +tox -e{py27,py34,py35,py36,py37,pypy}-scaffolds, diff --git a/setup.py b/setup.py index 17a18f3b5..10ed3fa23 100644 --- a/setup.py +++ b/setup.py @@ -68,6 +68,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", -- cgit v1.2.3 From cb887e906a20c7be2efce719d0f3e6afa113f37e Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 22 Aug 2018 09:16:22 -0700 Subject: venv is for Python 3.3+, and we support 3.4, so just 3 is fine --- docs/quick_tutorial/requirements.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index 1d5395138..a74c07673 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -23,7 +23,7 @@ This *Quick Tutorial* is based on: 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.7'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. -- cgit v1.2.3 From 1c44d2b9032dc145140cfc74f1a97d316931244b Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 22 Aug 2018 10:21:26 -0700 Subject: Just Python 3 is fine --- docs/quick_tour.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index 265f67a4f..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.7+ on Linux: +As an example, for Python 3 on Linux: .. parsed-literal:: -- cgit v1.2.3