pull pytest from testrun for py26

2011-07-07 23:14:34 +02:00
parent b04616419e
commit 1c2563d864
1 changed files with 8 additions and 4 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,22 @@
 [tox]
 envlist=py26,py31,py27,py25,py24
 indexserver=
-    default = http://pypi.testrun.org
+    testrun = http://pypi.testrun.org
    pypi = http://pypi.python.org/simple

 [testenv]
-
 changedir=testing
-deps=pytest
+deps=:testrun:pytest
 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]
 deps=
-    pytest
+    :testrun:pytest
    :pypi:pexpect

 [pytest]