Make 'mock' a run-time rather than setup-time dependency. This is necessary in order...

diff --git a/setup.py b/setup.py
index 65426e0ed97fa4d56412c5ca50962419f80310c0..8c48e18d239afd8287938a3a98c10a97568e1f17 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -169,11 +169,9 @@ if "--reporter=bwverbose-coverage" in sys.argv:
 if "sdist_dsc" in sys.argv:
     setup_requires.append('stdeb >= 0.3')
 
-tests_require=[
-    # Mock - Mocking and Testing Library
-    # http://www.voidspace.org.uk/python/mock/
-    "mock",
-    ]
+# We no longer have any requirements specific to tests.
+tests_require=[]
+
 
 class ShowSupportLib(Command):
     user_options = []

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index ba450f9b6f3743a54d839e835ca2babb8431f31b..9e9ff69aea8935e4a7ff810fcc340e9cf7fff93a 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -30,6 +30,9 @@ install_requires=[
                   "pycrypto == 2.0.1, == 2.1, >= 2.3",
                   "pyasn1 >= 0.0.8a",
 
+                  # http://www.voidspace.org.uk/python/mock/
+                  "mock",
+
                   # Will be needed to test web apps, but not yet. See #1001.
                   #"windmill >= 1.3",
                   ]