bump foolscap dependency to 0.10.1

[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 ba74b1aefd37c67dec40dc57e8efccf7c4b09fe9..4dcd50f75ed432f259dd6e0b66ce8d36269a8bfb 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -37,22 +37,19 @@ install_requires = [
     # * foolscap 0.8.0 generates 2048-bit RSA-with-SHA-256 signatures,
     #   rather than 1024-bit RSA-with-MD5. This also allows us to work
     #   with a FIPS build of OpenSSL.
-    "foolscap >= 0.8.0",
+    "foolscap >= 0.10.1",
 
     # Needed for SFTP.
     # pycrypto 2.2 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/620253>
     # pycrypto 2.4 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/881130>
     "pycrypto >= 2.1.0, != 2.2, != 2.4",
 
-    # <http://www.voidspace.org.uk/python/mock/>, 0.8.0 provides "call"
-    "mock >= 0.8.0",
-
     # 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,10 +66,10 @@ package_imports = [
     ('python',           None),
     ('platform',         None),
     ('pyOpenSSL',        'OpenSSL'),
+    ('OpenSSL',          None),
     ('simplejson',       'simplejson'),
     ('pycrypto',         'Crypto'),
     ('pyasn1',           'pyasn1'),
-    ('mock',             'mock'),
     ('service-identity', 'service_identity'),
     ('characteristic',   'characteristic'),
     ('pyasn1-modules',   'pyasn1_modules'),
@@ -81,8 +78,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.
@@ -145,6 +140,7 @@ _use_old_Twisted_and_Nevow = False
 if sys.platform == "win32":
     try:
         import win32api
+        [win32api]
     except ImportError:
         _use_old_Twisted_and_Nevow = True
 
@@ -168,7 +164,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