Merge remote-tracking branch 'refs/remotes/Pylons/master'

1 files changed, 92 insertions, 35 deletions

diff --git a/tox.ini b/tox.ini
index 73a487ac8..d29f41662 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,46 +1,103 @@
 [tox]
-envlist = 
-    py24,py25,py26,py27,jython,pypy,cover
+envlist =
+    py27,py33,py34,py35,pypy,pypy3,
+    docs,pep8,
+    {py2,py3}-cover,coverage,
 
 [testenv]
-commands = 
-    python setup.py test -q
-deps =
-    Sphinx
-    WebTest
-    repoze.sphinx.autointerface
-    virtualenv
-
-[testenv:py24]
-# Chameleon 2 doesnt work under py2.4
-commands = 
-    python setup.py test -q
-deps =
-    Sphinx
-    WebTest
-    repoze.sphinx.autointerface
-    virtualenv
-    Chameleon<=1.999
+# 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
+    pypy: pypy
+    pypy3: pypy3
+    py2: python2.7
+    py3: python3.5
 
-[testenv:jython]
-commands = 
-   jython setup.py test -q
+commands =
+    pip install pyramid[testing]
+    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
 
-[testenv:cover]
-basepython =
-    python2.6
-commands = 
-    python setup.py nosetests --with-xunit --with-xcoverage
+[testenv:py27-scaffolds]
+basepython = python2.7
+commands =
+    python pyramid/scaffolds/tests.py
+deps = virtualenv
+
+[testenv:py32-scaffolds]
+basepython = python3.2
+commands =
+    python pyramid/scaffolds/tests.py
+deps = virtualenv
+
+[testenv:py33-scaffolds]
+basepython = python3.4
+commands =
+    python pyramid/scaffolds/tests.py
+deps = virtualenv
+
+[testenv:py34-scaffolds]
+basepython = python3.4
+commands =
+    python pyramid/scaffolds/tests.py
+deps = virtualenv
+
+[testenv:pypy-scaffolds]
+basepython = pypy
+commands =
+    python pyramid/scaffolds/tests.py
+deps = virtualenv
+
+[testenv:pypy3-scaffolds]
+basepython = pypy3
+commands =
+    python pyramid/scaffolds/tests.py
+deps = virtualenv
+
+[testenv:pep8]
+basepython = python3.5
+commands =
+    flake8 pyramid/
 deps =
-    Sphinx
-    WebTest
-    repoze.sphinx.autointerface
-    virtualenv
-    nose
-    coverage
-    nosexcover
+    flake8
+
+[testenv:docs]
+basepython = python3.5
+whitelist_externals = make
+commands =
+    pip install pyramid[docs]
+    make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
 
 # we separate coverage into its own testenv because a) "last run wins" wrt
 # cobertura jenkins reporting and b) pypy and jython can't handle any
 # combination of versions of coverage and nosexcover that i can find.
+[testenv:py2-cover]
+commands =
+    pip install pyramid[testing]
+    coverage run --source=pyramid {envbindir}/nosetests
+    coverage xml -o coverage-py2.xml
+setenv =
+    COVERAGE_FILE=.coverage.py2
 
+[testenv:py3-cover]
+commands =
+    pip install pyramid[testing]
+    coverage run --source=pyramid {envbindir}/nosetests
+    coverage xml -o coverage-py3.xml
+setenv =
+    COVERAGE_FILE=.coverage.py3
+
+[testenv:coverage]
+basepython = python3.5
+commands =
+    coverage erase
+    coverage combine
+    coverage xml
+    coverage report --show-missing --fail-under=100
+deps =
+    coverage
+setenv =
+    COVERAGE_FILE=.coverage