diff options
| author | Michael Merickel <michael@merickel.org> | 2017-01-08 14:24:46 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-08 14:24:46 -0600 |
| commit | 041769e2450358bfa3a1c7e4519a52dfcd35c50d (patch) | |
| tree | 11e930b7edb1186658282bc3ed1a429af144a0cc | |
| parent | 7636ff69e9d64233f657e0f61234ae8f0dec6ba8 (diff) | |
| parent | 0844c664ad00fcbb6600231a012ad6384da15f5a (diff) | |
| download | pyramid-041769e2450358bfa3a1c7e4519a52dfcd35c50d.tar.gz pyramid-041769e2450358bfa3a1c7e4519a52dfcd35c50d.tar.bz2 pyramid-041769e2450358bfa3a1c7e4519a52dfcd35c50d.zip | |
Merge pull request #2885 from mmerickel/require-py36
require tests to pass on py36 on travis and appveyor
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 02e844196..b0e63ba97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,11 @@ matrix: env: TOXENV=docs - python: 3.5 env: TOXENV=pep8 - - python: 3.6-dev + - python: 3.6 env: TOXENV=py36 - python: nightly env: TOXENV=py37 allow_failures: - - env: TOXENV=py36 - env: TOXENV=py37 install: diff --git a/appveyor.yml b/appveyor.yml index 4c684bfc6..abbbfea92 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,7 @@ environment: matrix: + - PYTHON: "C:\\Python36" + TOXENV: "py36" - PYTHON: "C:\\Python35" TOXENV: "py35" - PYTHON: "C:\\Python27" @@ -40,6 +40,12 @@ commands = python pyramid/scaffolds/tests.py deps = virtualenv +[testenv:py36-scaffolds] +basepython = python3.6 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + [testenv:pypy-scaffolds] basepython = pypy commands = |