[tox] Fix py3 targets

asweigart · Nov 13, 2012 · 29cff28 · 29cff28
1 parent 9c564a9
commit 29cff28
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/tox.ini b/tox.ini
@@ -1,42 +1,38 @@
 [tox]
-envlist = py26,py27,pypy
+envlist = py26,py27,py32,py33,pypy
 
 [testenv]
 distribute = True
 sitepackages = False
 commands = nosetests
 
 [testenv:py32]
+distribute = True
 basepython = python3.2
 deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test3.txt
+       -r{toxinidir}/requirements/test-ci.txt
+       http://github.com/celery/kombu/zipball/master
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           {envbindir}/easy_install -U distribute
-           {envbindir}/pip install                              \
-                --download-cache={toxworkdir}/_download         \
-                -r{toxinidir}/requirements/test3.txt            \
-                coverage>=3.0                                   \
-                SQLAlchemy
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py33]
+distribute= True
 basepython = python3.3
 deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test3.txt
+       -r{toxinidir}/requirements/test-ci.txt
+       http://github.com/celery/kombu/zipball/master
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           {envbindir}/easy_install -U distribute
-           {envbindir}/pip install                              \
-                --download-cache={toxworkdir}/_download         \
-                -r{toxinidir}/requirements/test3.txt             \
-                coverage>=3.0                                   \
-                SQLAlchemy
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
+       http://github.com/celery/kombu/zipball/master
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install http://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -48,8 +44,8 @@ basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
+       http://github.com/celery/kombu/zipball/master
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install http://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -61,7 +57,7 @@ basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
-       coverag>=3.0
+       http://github.com/celery/kombu/zipball/master
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \