summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2014-05-15 11:33:28 +0200
committerholger krekel <holger@merlinux.eu>2014-05-15 11:33:28 +0200
commit360ee98eae10511bb32c82997052ff1ab278033f (patch)
treed8b30b7e0fed866b427ec3992bc427f797d4ca19 /tox.ini
parent23380da3f729a37106cc6ca2023429bdb547c780 (diff)
parent20de40c837b9616bb08c155fe108b61cc50cfae6 (diff)
downloadtox-360ee98eae10511bb32c82997052ff1ab278033f.tar.gz
Merged in cboylan/tox (pull request #85)
Fix command expansion and parsing.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index f2fc791..6bcca5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist=py27,py33,py26,py32,pypy
+envlist=py27,py26,py34,py33,py32,pypy,flakes
[testenv:X]
commands=echo {posargs}
@@ -18,6 +18,10 @@ commands=
--junitxml={envlogdir}/junit-{envname}.xml \
check_sphinx.py {posargs}
+[testenv:flakes]
+deps = pytest-flakes>=0.2
+commands = py.test --flakes -m flakes tox tests
+
[testenv:py25]
setenv= PIP_INSECURE=1