summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2011-11-08 17:14:16 +0000
committerAsk Solem <ask@celeryproject.org>2011-11-08 17:14:16 +0000
commitd80d4cd5874bb488311dee4efed5a84501f205d6 (patch)
tree717686780403a74afcfabe251748ad9569cb870d /tox.ini
parent5b9e9e3c9654d8e3e05f1502fc53644ad07a83ef (diff)
parentfff95c5ba0ba329026b25a4f78abf836b7718794 (diff)
downloadkombu-d80d4cd5874bb488311dee4efed5a84501f205d6.tar.gz
Merge branch 'master' into 2.0-devel
Conflicts: AUTHORS kombu/connection.py kombu/tests/test_connection.py kombu/utils/encoding.py
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 8 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index c1074490..6f8f8455 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,19 +7,24 @@ sitepackages = False
commands = nosetests
[testenv:py32]
+distribute= True
recreate = True
basepython = python3.2
changedir = .tox
deps = -r{toxinidir}/requirements/default.txt
- -r{toxinidir}/requirements/test-py3k.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+ {envbindir}/easy_install -U distribute
+ {envbindir}/pip install \
+ --download-cache={toxworkdir}/_download \
+ -r{toxinidir}/requirements/test-py3k.txt
+
nosetests -vd kombu.tests \
--with-coverage3 \
--cover3-branch \
--cover3-xml \
--cover3-xml-file={toxinidir}/coverage.xml \
- --cover3-html \
- --cover3-html-dir={toxinidir}/cover \
+ #--cover3-html \
+ #--cover3-html-dir={toxinidir}/cover \
--cover3-package=kombu \
--cover3-exclude="kombu kombu.utils.* \
kombu.transport.pypika \