summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 4 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 81cbfa0..bfc2634 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,14 @@
[tox]
-envlist=py27,py26,py25,py32,py33,docs,pypy
+envlist=py27,py26,py32,py33,docs,pypy
[testenv:X]
commands=echo {posargs}
[testenv]
-commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
-deps=pytest==2.3.4
- pytest-instafail
+commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+deps=pytest>=2.3.5
-[testenv:py25]
+[testenv:py25] # requires virtualenv-1.9.1
setenvs =
PIP_INSECURE=True