Merge pull request #3365 from stevepiercy/1.8-branch

Steve Piercy

2018-09-22 e22970cd21eb36c2a658c843bb5cb4f59d77fd19

 tox.ini

@@ -1,35 +1,29 @@
[tox]
envlist =
    py27,py33,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
# to defaults for others.
basepython =
    py27: python2.7
    py33: python3.3
    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]
basepython = python2.7
commands =
    python pyramid/scaffolds/tests.py
deps = virtualenv

[testenv:py33-scaffolds]
basepython = python3.3
commands =
    python pyramid/scaffolds/tests.py
deps = virtualenv
@@ -42,6 +36,12 @@

[testenv:py35-scaffolds]
basepython = python3.5
commands =
    python pyramid/scaffolds/tests.py
deps = virtualenv

[testenv:py36-scaffolds]
basepython = python3.6
commands =
    python pyramid/scaffolds/tests.py
deps = virtualenv
@@ -78,7 +78,7 @@
# 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 =
@@ -86,7 +86,7 @@

[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 =