summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
committerChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
commitb2e8884a94d9e869bf29ea55298ad308f16ed420 (patch)
treee46bf79d1a8811ad273a40ce194d05836fcc7409 /tox.ini
parent7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff)
parent40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff)
downloadpyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini17
1 files changed, 12 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 8ceb142cb..242decfc4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
[tox]
envlist =
- py27,py34,py35,py36,pypy,
+ py27,py34,py35,py36,py37,pypy,
docs,pep8,
{py2,py3}-cover,coverage,
-skip-missing-interpreters = True
+skip_missing_interpreters = True
[testenv]
# Most of these are defaults but if you specify any you can't fall back
@@ -13,12 +13,13 @@ basepython =
py34: python3.4
py35: python3.5
py36: python3.6
+ py37: python3.7
pypy: pypy
py2: python2.7
py3: python3.5
commands =
- pip install pyramid[testing]
+ pip install -q pyramid[testing]
nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
[testenv:py27-scaffolds]
@@ -39,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 =
@@ -71,7 +78,7 @@ commands =
# combination of versions of coverage and nosexcover that i can find.
[testenv:py2-cover]
commands =
- pip install pyramid[testing]
+ pip install -q pyramid[testing]
coverage run --source=pyramid {envbindir}/nosetests
coverage xml -o coverage-py2.xml
setenv =
@@ -79,7 +86,7 @@ setenv =
[testenv:py3-cover]
commands =
- pip install pyramid[testing]
+ pip install -q pyramid[testing]
coverage run --source=pyramid {envbindir}/nosetests
coverage xml -o coverage-py3.xml
setenv =