Remove packages from not_import_versionable that we now can always version.

[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..6b0bdd6a16c171d30ed96dec37f3bf3b7ec3ecc8 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -69,6 +69,7 @@ package_imports = [
     ('python',           None),
     ('platform',         None),
     ('pyOpenSSL',        'OpenSSL'),
+    ('OpenSSL',          None),
     ('simplejson',       'simplejson'),
     ('pycrypto',         'Crypto'),
     ('pyasn1',           'pyasn1'),
@@ -81,8 +82,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 +144,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 +168,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