summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini38
1 files changed, 19 insertions, 19 deletions
diff --git a/tox.ini b/tox.ini
index 32fcb45fd..f3b21561f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,13 +22,6 @@ 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 +41,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 +53,18 @@ deps =
setenv =
COVERAGE_FILE=.coverage
+[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:py26-scaffolds]
basepython = python2.6
commands =
@@ -113,3 +106,10 @@ basepython = pypy3
commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
+
+[testenv:pep8]
+basepython = python3.4
+commands =
+ flake8 pyramid/
+deps =
+ flake8