diff --git a/tox.ini b/tox.ini index a25bd6eef..98c295fde 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,13 @@ [tox] distshare={homedir}/.tox/distshare envlist=py25,py26,py27,py27-nobyte,py32,py33,py27-xdist,trial -indexserver= - pypi = https://pypi.python.org/simple - testrun = http://pypi.testrun.org - default = http://pypi.testrun.org [testenv] changedir=testing commands= py.test --lsof -rfsxX --junitxml={envlogdir}/junit-{envname}.xml [] deps= - :pypi:pexpect - :pypi:nose + pexpect + nose [testenv:genscript] changedir=. @@ -21,8 +17,8 @@ commands= py.test --genscript=pytest1 changedir=. basepython=python2.7 deps=pytest-xdist - :pypi:mock - :pypi:nose + mock + nose commands= py.test -n3 -rfsxX \ --junitxml={envlogdir}/junit-{envname}.xml testing @@ -39,8 +35,8 @@ commands= [testenv:trial] changedir=. -deps=:pypi:twisted - :pypi:pexpect +deps=twisted + pexpect commands= py.test -rsxf testing/test_unittest.py \ --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py} @@ -51,17 +47,17 @@ deps= [testenv:py32] deps= - :pypi:nose + nose [testenv:py33] deps= - :pypi:nose + nose [testenv:doc] basepython=python changedir=doc/en -deps=:pypi:sphinx - :pypi:PyYAML +deps=sphinx + PyYAML commands= make clean @@ -70,15 +66,15 @@ commands= [testenv:regen] basepython=python changedir=doc/en -deps=:pypi:sphinx - :pypi:PyYAML +deps=sphinx + PyYAML commands= rm -rf /tmp/doc-exec* #pip install pytest==2.3.4 make regen [testenv:py31] -deps=:pypi:nose>=1.0 +deps=nose>=1.0 [testenv:py31-xdist] deps=pytest-xdist