From 35b0d82423b88702bbaaa20436b28720c70e3a6d Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Mon, 12 Jan 2015 17:31:44 -0500
Subject: 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.
---
 tox.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tox.ini')

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}
-- 
cgit v1.2.1