aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2015-01-12 17:31:44 -0500
committerDoug Hellmann <doug@doughellmann.com>2015-01-12 17:31:44 -0500
commit35b0d82423b88702bbaaa20436b28720c70e3a6d (patch)
tree5890ddd2bb65ef900568388d730983223fe9398e
parentf96d9006080ad816cd492b7769c3d3b1d9206f72 (diff)
downloadexternal_python_setuptools-35b0d82423b88702bbaaa20436b28720c70e3a6d.tar.gz
external_python_setuptools-35b0d82423b88702bbaaa20436b28720c70e3a6d.tar.bz2
external_python_setuptools-35b0d82423b88702bbaaa20436b28720c70e3a6d.zip
Fix tox settings so they work
Update the dependency list to include the mock package. Update the way py.test is called to only scan the setuptools directory, to avoid scanning all of the packages installed in .tox and other temporary directories.
-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}