summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-24 14:23:47 -0600
committerMichael Merickel <michael@merickel.org>2017-01-08 14:19:39 -0600
commit0844c664ad00fcbb6600231a012ad6384da15f5a (patch)
tree1416f942b647eadfbcc2a193f5437da562442c6f
parent8553bd2f06405320d27129e8336d9655ae25e72c (diff)
downloadpyramid-0844c664ad00fcbb6600231a012ad6384da15f5a.tar.gz
pyramid-0844c664ad00fcbb6600231a012ad6384da15f5a.tar.bz2
pyramid-0844c664ad00fcbb6600231a012ad6384da15f5a.zip
require tests to pass on py36 on travis and appveyor
-rw-r--r--.travis.yml3
-rw-r--r--appveyor.yml2
-rw-r--r--tox.ini6
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"
diff --git a/tox.ini b/tox.ini
index d1df0f031..242decfc4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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 =