summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini43
1 files changed, 22 insertions, 21 deletions
diff --git a/tox.ini b/tox.ini
index 32fcb45fd..20a9ee5b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,py33,py34,pypy,pypy3,pep8,
+ py26,py27,py32,py33,py34,py35,pypy,pypy3,pep8,
{py2,py3}-docs,
{py2,py3}-cover,coverage,
@@ -13,22 +13,16 @@ basepython =
py32: python3.2
py33: python3.3
py34: python3.4
+ py35: python3.5
pypy: pypy
pypy3: pypy3
py2: python2.7
- py3: python3.4
+ py3: python3.5
commands =
pip install pyramid[testing]
nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
-[testenv:pep8]
-basepython = python3.4
-commands =
- flake8 pyramid/
-deps =
- flake8
-
# 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.
@@ -48,18 +42,6 @@ commands =
setenv =
COVERAGE_FILE=.coverage.py3
-[testenv:py2-docs]
-whitelist_externals = make
-commands =
- pip install pyramid[docs]
- make -C docs html epub BUILDDIR={envdir}
-
-[testenv:py3-docs]
-whitelist_externals = make
-commands =
- pip install pyramid[docs]
- make -C docs html epub BUILDDIR={envdir}
-
[testenv:coverage]
basepython = python3.4
commands =
@@ -72,6 +54,18 @@ deps =
setenv =
COVERAGE_FILE=.coverage
+[testenv:py2-docs]
+whitelist_externals = make
+commands =
+ pip install pyramid[docs]
+ make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+
+[testenv:py3-docs]
+whitelist_externals = make
+commands =
+ pip install pyramid[docs]
+ make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+
[testenv:py26-scaffolds]
basepython = python2.6
commands =
@@ -113,3 +107,10 @@ basepython = pypy3
commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
+
+[testenv:pep8]
+basepython = python3.4
+commands =
+ flake8 pyramid/
+deps =
+ flake8