aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-03-06 17:04:35 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-03-06 17:04:35 -0500
commitee042939e61f5bcbd0d5aeb51c6db97b20b91bf7 (patch)
tree440f05561ecee64f6f9adfa1094e33b2134037cf
parent427b3bf0f2ddc07cc01637605277ca555d5b26ce (diff)
parent35b0d82423b88702bbaaa20436b28720c70e3a6d (diff)
downloadexternal_python_setuptools-ee042939e61f5bcbd0d5aeb51c6db97b20b91bf7.tar.gz
external_python_setuptools-ee042939e61f5bcbd0d5aeb51c6db97b20b91bf7.tar.bz2
external_python_setuptools-ee042939e61f5bcbd0d5aeb51c6db97b20b91bf7.zip
Merge pull request #25 from dhellmann/fix-tox
Fix tox settings so they work
-rw-r--r--tox.ini6
1 files changed, 4 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 1ac46202..7aeffdd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
[tox]
envlist = py26,py27,py31,py32,py33,py34
[testenv]
-deps=pytest
-commands=py.test {posargs}
+deps=
+ pytest
+ mock
+commands=py.test setuptools {posargs}