From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 25 Sep 2014 17:54:14 +0000 (+0100)
Subject: Refactoring to move the not_import_versionable and ignorable package lists to _auto_d... 
X-Git-Tag: allmydata-tahoe-1.10.1a1~123
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/file/URI:LIT:krugkidfnzsc4/somewhere?a=commitdiff_plain;h=ea09305987a56876c573b4a569346c5ab044f1f0;p=tahoe-lafs%2Ftahoe-lafs.git

Refactoring to move the not_import_versionable and ignorable package lists to _auto_deps.py.

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

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 95019aaf..e7697e65 100644
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -281,10 +281,10 @@ def cross_check_pkg_resources_versus_import():
 def cross_check(pkg_resources_vers_and_locs, imported_vers_and_locs_list):
     """This function returns a list of errors due to any failed cross-checks."""
 
+    from _auto_deps import not_import_versionable, ignorable
+
     errors = []
-    not_pkg_resourceable = set(['python', 'platform', __appname__.lower()])
-    not_import_versionable = set(['zope.interface', 'mock', 'pyasn1'])
-    ignorable = set(['argparse', 'pyutil', 'zbase32', 'distribute', 'twisted-web', 'twisted-core', 'twisted-conch'])
+    not_pkg_resourceable = ['python', 'platform', __appname__.lower()]
 
     for name, (imp_ver, imp_loc, imp_comment) in imported_vers_and_locs_list:
         name = name.lower()
diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 2869a9e3..6365119e 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -92,6 +92,24 @@ package_imports = [
     ('service-identity', 'service_identity')
 ]
 
+# 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.
+ignorable = [
+    'argparse',
+    'pyutil',
+    'zbase32',
+    'distribute',
+    'twisted-web',
+    'twisted-core',
+    'twisted-conch',
+]
+
 def require_more():
     import sys