summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2011-05-06 14:51:12 +0100
committerMichael Foord <michael@voidspace.org.uk>2011-05-06 14:51:12 +0100
commit602f0c513a7575bf4e6f1473b741e0196faedced (patch)
tree2911fb39b43bd034f177b17dc69a1f6fcfe81c58
parent5041125da573227517eee179d3f1a5fca8b7931e (diff)
downloadmock-602f0c513a7575bf4e6f1473b741e0196faedced.tar.gz
Use isolated binaries for tox config
-rw-r--r--docs/changelog.txt3
-rw-r--r--tox.ini26
2 files changed, 14 insertions, 15 deletions
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9062393..0a5c765 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -47,9 +47,10 @@ CHANGELOG
2011/05/06 Version 0.7.1
------------------------
-Package fixes contributed by Michael Fladischer.
+Package fixes contributed by Michael Fladischer. No code changes.
* Include template in package
+* Use isolated binaries for the tox tests
2011/03/05 Version 0.7.0
diff --git a/tox.ini b/tox.ini
index 4a7043c..c6b7477 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,37 +3,35 @@ envlist = py24,py25,py26,py27,py31,pypy,py32,jython
[testenv]
deps=unittest2
-commands=unit2 discover []
+commands={envbindir}/unit2 discover []
[testenv:py26]
commands=
- unit2 discover []
- sphinx-build -b doctest docs html
- sphinx-build docs html
-deps =
+ {envbindir}/unit2 discover []
+ {envbindir}/sphinx-build -b doctest docs html
+ {envbindir}/sphinx-build docs html
+deps =
unittest2
sphinx
[testenv:py27]
commands=
- unit2 discover []
- sphinx-build -b doctest docs html
-deps =
+ {envbindir}/unit2 discover []
+ {envbindir}/sphinx-build -b doctest docs html
+deps =
unittest2
sphinx
[testenv:py31]
-commands=
- unit2 discover []
-deps =
+deps =
unittest2py3k
[testenv:py32]
commands=
- python -m unittest discover []
-deps =
+ {envbindir}/python -m unittest discover []
+deps =
[testenv:pypy]
deps=unittest2
-commands=unit2 discover [] \ No newline at end of file
+commands={envbindir}/unit2 discover []