From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 17 Apr 2015 20:49:35 +0000 (+0100)
Subject: Tweak requirement for six and declare python-gflags as not import-versionable.
X-Git-Url: https://git.rkrishnan.org/uri?a=commitdiff_plain;h=a9273a01c13210a3641634a87d128c5baf127e19;p=tahoe-lafs%2Ftahoe-lafs.git

Tweak requirement for six and declare python-gflags as not import-versionable.

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

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 93ebfde3..859cb77b 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -51,8 +51,8 @@ install_requires = [
     "txAWS == 0.2.1.post5",
     "oauth2client == 1.1.0",
 
-    # needed for cloud backend; also latest cryptography depends on this version
-    "six >= 1.4.1",
+    # needed for cloud backend; also latest pyOpenSSL depends on this version
+    "six >= 1.5.2",
 ]
 
 # Includes some indirect dependencies, but does not include allmydata.
@@ -84,6 +84,7 @@ not_import_versionable = [
     'mock',
     'pyasn1',
     'pyasn1-modules',
+    'python-gflags',
 ]
 
 # Dependencies reported by pkg_resources that we can safely ignore.