Bump pyasn1 requirement to >= 0.1.8.

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / _auto_deps.py

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 69a6081586960e71207de1e96297bfbe4d6e8a1f..a78844e6d2bb270cc18e77c04ebd34c72416e7a7 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -45,14 +45,15 @@ 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",
 
     "service-identity",         # this is needed to suppress complaints about being unable to verify certs
     "characteristic >= 14.0.0", # latest service-identity depends on this version
-    "pyasn1 >= 0.1.4",          # latest pyasn1-modules depends on this version
+    "pyasn1 >= 0.1.8",          # latest pyasn1-modules depends on this version
     "pyasn1-modules >= 0.0.5",  # service-identity depends on this
 ]
 
@@ -69,6 +70,7 @@ package_imports = [
     ('python',           None),
     ('platform',         None),
     ('pyOpenSSL',        'OpenSSL'),
+    ('OpenSSL',          None),
     ('simplejson',       'simplejson'),
     ('pycrypto',         'Crypto'),
     ('pyasn1',           'pyasn1'),
@@ -81,8 +83,6 @@ 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',
 ]
 
 # Dependencies reported by pkg_resources that we can safely ignore.
@@ -169,7 +169,8 @@ else:
 #   not *directly* depend on pyOpenSSL.
 #
 # * pyOpenSSL >= 0.13 is needed in order to avoid
-#   <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2005>.
+#   <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2005>, and also to check the
+#   version of OpenSSL that pyOpenSSL is using.
 #
 # * pyOpenSSL >= 0.14 is built on the 'cryptography' package which depends
 #   on 'cffi' (and indirectly several other packages). Unfortunately cffi