summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-08-20 22:15:02 -0700
committerGitHub <noreply@github.com>2016-08-20 22:15:02 -0700
commit395b176283543b9e771bc4be04b5a3ae382ed778 (patch)
treeeed405ea5614e4f0c38ef83ec07790168f402f4b /tox.ini
parent1c864fdc211ac1a14628a3427d00ac1253c24cde (diff)
parent1941d27c65c99a38b29dde9536e71d08dc9f64d9 (diff)
downloadpyramid-395b176283543b9e771bc4be04b5a3ae382ed778.tar.gz
pyramid-395b176283543b9e771bc4be04b5a3ae382ed778.tar.bz2
pyramid-395b176283543b9e771bc4be04b5a3ae382ed778.zip
Merge pull request #2754 from stevepiercy/master
add testing for py36
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 0156d9e51..a74aaadbc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,9 @@
[tox]
envlist =
- py27,py33,py34,py35,pypy,
+ py27,py33,py34,py35,py36,pypy,
docs,pep8,
{py2,py3}-cover,coverage,
+skip-missing-interpreters = True
[testenv]
# Most of these are defaults but if you specify any you can't fall back
@@ -12,6 +13,7 @@ basepython =
py33: python3.3
py34: python3.4
py35: python3.5
+ py36: python3.6
pypy: pypy
py2: python2.7
py3: python3.5