summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-06-22 09:17:14 +0200
committerholger krekel <holger@merlinux.eu>2013-06-22 09:17:14 +0200
commit208b49a4269a258043150b5b47f62236accff270 (patch)
tree3910b16b425d21e7a9dfd89ea27eae2780d47df1 /tox.ini
parentba3caa0dc99f4d62b71a2a49cd32873d1f60d1dc (diff)
downloadtox-208b49a4269a258043150b5b47f62236accff270.tar.gz
fix whitelist_externals on windows, bump version for release prep1.5.0
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 3 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 05be67a..d5d77d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,18 @@
[tox]
envlist=py27,py26,py25,py32,py33,docs,pypy
-indexserver =
- testrun = http://pypi.testrun.org
- pypi = https://pypi.python.org/simple
[testenv:X]
commands=echo {posargs}
[testenv]
-commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
deps=pytest==2.3.4
+ pytest-instafail
[testenv:docs]
basepython=python
changedir=doc
-deps=:pypi:sphinx
+deps=sphinx
{[testenv]deps}
commands=
py.test -v \