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 1d14e47a9e26162395ffd0e1c53da3750dc9330e..d9985db0689e1acf4ddfaf35fc5fad68d87753d9 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -56,8 +56,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.
@@ -90,6 +90,10 @@ package_imports = [
 # Dependencies for which we don't know how to get a version number at run-time.
 not_import_versionable = [
     'zope.interface',
+    'mock',
+    'pyasn1',
+    'pyasn1-modules',
+    'python-gflags',
 ]
 
 # Dependencies reported by pkg_resources that we can safely ignore.