From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 24 Jul 2015 14:51:01 +0000 (+0100)
Subject: Blacklist mock > 1.0.1.
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=2bf0e9bd689ff43761e85dee87f6f70de8f6e941;p=tahoe-lafs%2Ftahoe-lafs.git

Blacklist mock > 1.0.1.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 8ae03d6d..ccb484d5 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -61,8 +61,9 @@ install_requires = [
     "pycrypto == 2.1.0, == 2.3, >= 2.4.1",
     "pyasn1 >= 0.0.8a",
 
-    # http://www.voidspace.org.uk/python/mock/ , 0.8.0 provides "call"
-    "mock >= 0.8.0",
+    # <http://www.voidspace.org.uk/python/mock/>, 0.8.0 provides "call"
+    # mock 1.1.x seems to cause problems on several buildslaves.
+    "mock >= 0.8.0, <= 1.0.1",
 
     # pycryptopp-0.6.0 includes ed25519
     "pycryptopp >= 0.6.0",