diff --git a/tox.ini b/tox.ini index 8e65248..2d10573 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,15 @@ [tox] -envlist=py26,py31,py27,py25,py24 -indexserver= - testrun = http://pypi.testrun.org - pypi = http://pypi.python.org/simple +envlist=py26,py32,py33,py27,py25 [testenv] changedir=testing -deps=:testrun:pytest>=2.2.0.dev2 +deps=pytest>=2.3.5 commands= py.test --junitxml={envlogdir}/junit-{envname}.xml [] -#[testenv:py31] -#deps=:pypi:pytest # XXX needed because ClueRelease/pip broken -#[testenv:py32] -#deps=:pypi:pytest # XXX needed because ClueRelease/pip broken - -[testenv:py26] +[testenv:py27] deps= - :testrun:pytest - :pypi:pexpect + pytest + pexpect [pytest] addopts = -rsfxX