summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-04-19 16:26:26 -0500
committerMichael Merickel <michael@merickel.org>2015-04-19 16:26:26 -0500
commitdddf33c6b9558fbfdb1bc048b6371e87ddc4388b (patch)
treefaa2f4e48a36fd29b9f33d8be7d2f6a103ef80f4 /tox.ini
parent4d8580c92b1c4ed45e954f79fcbe1dc018ee700b (diff)
parent2af5552a41c82e415092e19ffcc49b16965fb378 (diff)
downloadpyramid-dddf33c6b9558fbfdb1bc048b6371e87ddc4388b.tar.gz
pyramid-dddf33c6b9558fbfdb1bc048b6371e87ddc4388b.tar.bz2
pyramid-dddf33c6b9558fbfdb1bc048b6371e87ddc4388b.zip
Merge branch 'pr/1571'
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini14
1 files changed, 12 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 7f3d0c906..32fcb45fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,py33,py34,pypy,pypy3,
+ py26,py27,py32,py33,py34,pypy,pypy3,pep8,
{py2,py3}-docs,
{py2,py3}-cover,coverage,
@@ -22,6 +22,16 @@ 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.
[testenv:py2-cover]
commands =
pip install pyramid[testing]
@@ -52,7 +62,7 @@ commands =
[testenv:coverage]
basepython = python3.4
-commands =
+commands =
coverage erase
coverage combine
coverage xml