From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 16 Jul 2015 14:24:45 +0000 (+0100)
Subject: Blacklist mock > 1.0.1.
X-Git-Tag: allmydata-tahoe-1.10.2b1~15
X-Git-Url: https://git.rkrishnan.org/a?a=commitdiff_plain;h=baaf2a4a559a23ef67da3d997c3750116070c8d8;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 6b0bdd6a..cbdc9bec 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -45,7 +45,8 @@ install_requires = [
     "pycrypto >= 2.1.0, != 2.2, != 2.4",
 
     # <http://www.voidspace.org.uk/python/mock/>, 0.8.0 provides "call"
-    "mock >= 0.8.0",
+    # 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",