From 6653a34ea0ed7f6571ea59d7f4e920252396d566 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Tue, 13 Sep 2011 18:14:20 +0100
Subject: [PATCH] More tox improvements

---
 tox.ini | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/tox.ini b/tox.ini
index f88bea41..547caaed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py24,py25,py26,py27,pypy
+envlist = py24,py25,py26,py27,py32,pypy
 
 [testenv]
 distribute = True
@@ -10,9 +10,9 @@ commands = nosetests
 recreate = True
 basepython = python3.2
 changedir = .tox
-commands = pip -E {envdir} install -r ../requirements/default.txt
-           pip -E {envdir} install -r ../requirements/test-py3k.txt
-           nosetests -vd kombu.tests                            \
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test-py3k.txt
+commands = nosetests -vd kombu.tests                            \
                 --with-coverage3                                \
                 --cover3-branch                                 \
                 --cover3-xml                                    \
@@ -30,43 +30,43 @@ commands = pip -E {envdir} install -r ../requirements/default.txt
 
 [testenv:py27]
 basepython = python2.7
-commands = pip -E {envdir} install -r requirements/default.txt
-           pip -E {envdir} install -r requirements/test.txt
-           nosetests --with-xunit --xunit-file=nosetests.xml \
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test.txt
+commands = nosetests --with-xunit --xunit-file=nosetests.xml \
                      --with-coverage3  --cover3-xml          \
                      --cover3-xml-file=coverage.xml
 
 [testenv:py26]
 basepython = python2.6
-commands = pip -E {envdir} install -r requirements/default.txt
-           pip -E {envdir} install -r requirements/test.txt
-           nosetests --with-xunit --xunit-file=nosetests.xml \
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test.txt
+commands = nosetests --with-xunit --xunit-file=nosetests.xml \
                      --with-coverage3  --cover3-xml          \
                      --cover3-xml-file=coverage.xml
 
 [testenv:py25]
 basepython = python2.5
-commands = pip -E {envdir} install -r requirements/default.txt
-           pip -E {envdir} install -r requirements/test.txt
-           nosetests --with-xunit --xunit-file=nosetests.xml \
-                     --with-coverage3  --cover3-xml          \
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test.txt
+commands = nosetests --with-xunit --xunit-file=nosetests.xml \
+                     --with-coverage3 --cover3-xml          \
                      --cover3-xml-file=coverage.xml
 
 
 [testenv:py24]
 basepython = python2.4
-commands = pip -E {envdir} install -r requirements/default.txt
-           pip -E {envdir} install -r requirements/py24.txt
-           pip -E {envdir} install -r requirements/test.txt
-           nosetests --with-xunit --xunit-file=nosetests.xml \
-                     --with-coverage3  --cover3-xml          \
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/py24.txt
+       -r{toxinidir}/requirements/test.txt
+commands = nosetests --with-xunit --xunit-file=nosetests.xml \
+                     --with-coverage3 --cover3-xml          \
                      --cover3-xml-file=coverage.xml
 
 
 [testenv:pypy]
 basepython = pypy
-commands = pip -E {envdir} install -r requirements/default.txt
-           pip -E {envdir} install -r requirements/test-pypy.txt
-           nosetests --with-xunit --xunit-file=nosetests.xml \
-                     --with-coverage3  --cover3-xml          \
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test-pypy.txt
+commands = nosetests --with-xunit --xunit-file=nosetests.xml \
+                     --with-coverage3 --cover3-xml          \
                      --cover3-xml-file=coverage.xml