Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Python 3.7 and 3.8 with allowed failure of 3.8 #3333

Merged
merged 5 commits into from
Aug 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------

Expand Down
4 changes: 2 additions & 2 deletions HACKING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions RELEASING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
environment:
matrix:
- PYTHON: "C:\\Python37"
TOXENV: "py37"
- PYTHON: "C:\\Python36"
TOXENV: "py36"
- PYTHON: "C:\\Python35"
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/quick_tour.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
6 changes: 3 additions & 3 deletions docs/quick_tutorial/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/wiki/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Python 2.7:

c:\Python27\Scripts\virtualenv %VENV%

Python 3.6:
Python 3.7:

.. code-block:: doscon

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/wiki2/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Python 2.7:

c:\Python27\Scripts\virtualenv %VENV%

Python 3.6:
Python 3.7:

.. code-block:: doscon

Expand Down
2 changes: 1 addition & 1 deletion scaffoldtests.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
tox -e{py27,py34,py35,pypy}-scaffolds,
tox -e{py27,py34,py35,py36,py37,pypy}-scaffolds,
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def readfile(name):
"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",
Expand Down
9 changes: 8 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -13,6 +13,7 @@ basepython =
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
pypy: pypy
pypy3: pypy3
py2: python2.7
Expand Down Expand Up @@ -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 =
Expand Down