def get_package_versions_and_locations():
import warnings
from _auto_deps import package_imports, global_deprecation_messages, deprecation_messages, \
- runtime_warning_messages, warning_imports
+ runtime_warning_messages, warning_imports, ignorable
def package_dir(srcfile):
return os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile))))
elif pkgname == 'OpenSSL':
packages.append( (pkgname, get_openssl_version()) )
- return packages
+ cross_check_errors = []
+
+ if not hasattr(sys, 'frozen'):
+ import pkg_resources
+ from _auto_deps import install_requires
+
+ pkg_resources_vers_and_locs = dict([(p.project_name.lower(), (str(p.version), p.location))
+ for p in pkg_resources.require(install_requires)])
+
+ imported_packages = set([p.lower() for (p, _) in packages])
+ extra_packages = []
+
+ for pr_name, (pr_ver, pr_loc) in pkg_resources_vers_and_locs.iteritems():
+ if pr_name not in imported_packages and pr_name not in ignorable:
+ extra_packages.append( (pr_name, (pr_ver, pr_loc, "according to pkg_resources")) )
+
+ cross_check_errors = cross_check(pkg_resources_vers_and_locs, packages)
+ packages += extra_packages
+
+ return packages, cross_check_errors
def check_requirement(req, vers_and_locs):
return True
-_vers_and_locs_list = get_package_versions_and_locations()
-
-
-def cross_check_pkg_resources_versus_import():
- """This function returns a list of errors due to any failed cross-checks."""
-
- import pkg_resources
- from _auto_deps import install_requires
-
- pkg_resources_vers_and_locs = dict([(p.project_name.lower(), (str(p.version), p.location))
- for p in pkg_resources.require(install_requires)])
-
- return cross_check(pkg_resources_vers_and_locs, _vers_and_locs_list)
-
-
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
+ from _auto_deps import not_import_versionable
errors = []
not_pkg_resourceable = ['python', 'platform', __appname__.lower(), 'openssl']
"by pkg_resources, but version %r (normalized to %r, from %r) by import."
% (name, pr_ver, str(pr_normver), pr_loc, imp_ver, str(imp_normver), imp_loc))
- imported_packages = set([p.lower() for (p, _) in imported_vers_and_locs_list])
- extra_vers_and_locs_list = []
- for pr_name, (pr_ver, pr_loc) in pkg_resources_vers_and_locs.iteritems():
- if pr_name not in imported_packages and pr_name not in ignorable:
- extra_vers_and_locs_list.append( (pr_name, (pr_ver, pr_loc, "according to pkg_resources")) )
+ return errors
- return errors, extra_vers_and_locs_list
+
+_vers_and_locs_list, _cross_check_errors = get_package_versions_and_locations()
def get_error_string(errors, debug=False):
from allmydata._auto_deps import install_requires
- errors = []
+ fatal_errors = []
# We require at least 2.6 on all platforms.
# (On Python 3, we'll have failed long before this point.)
version_string = ".".join(map(str, sys.version_info))
except Exception:
version_string = repr(sys.version_info)
- errors.append("Tahoe-LAFS currently requires Python v2.6 or greater (but less than v3), not %s"
- % (version_string,))
+ fatal_errors.append("Tahoe-LAFS currently requires Python v2.6 or greater (but less than v3), not %s"
+ % (version_string,))
vers_and_locs = dict(_vers_and_locs_list)
for requirement in install_requires:
try:
check_requirement(requirement, vers_and_locs)
except (ImportError, PackagingError), e:
- errors.append("%s: %s" % (e.__class__.__name__, e))
+ fatal_errors.append("%s: %s" % (e.__class__.__name__, e))
- if errors:
- raise PackagingError(get_error_string(errors, debug=True))
+ if fatal_errors:
+ raise PackagingError(get_error_string(fatal_errors + _cross_check_errors, debug=True))
check_all_requirements()
return dict([(k, l) for k, (v, l, c) in _vers_and_locs_list])
def get_package_versions_string(show_paths=False, debug=False):
- errors = []
- if not hasattr(sys, 'frozen'):
- global _vers_and_locs_list
- errors, extra_vers_and_locs_list = cross_check_pkg_resources_versus_import()
- _vers_and_locs_list += extra_vers_and_locs_list
-
res = []
for p, (v, loc, comment) in _vers_and_locs_list:
info = str(p) + ": " + str(v)
output = "\n".join(res) + "\n"
- if errors:
- output += get_error_string(errors, debug=debug)
+ if _cross_check_errors:
+ output += get_error_string(_cross_check_errors, debug=debug)
return output
+import sys
+import pkg_resources
from pkg_resources import Requirement
from twisted.trial import unittest
-from allmydata import check_requirement, cross_check, extract_openssl_version, PackagingError
+from allmydata import check_requirement, cross_check, get_package_versions_and_locations, \
+ extract_openssl_version, PackagingError
from allmydata.util.verlib import NormalizedVersion as V, \
IrrationalVersionError, \
suggest_normalized_version as suggest
for pkg, ver in vers_and_locs.items():
self.failIf(ver[0] in Requirement.parse(req), str((ver, req)))
+ def test_packages_from_pkg_resources(self):
+ if hasattr(sys, 'frozen'):
+ raise unittest.SkipTest("This test doesn't apply to frozen builds.")
+
+ class MockPackage(object):
+ def __init__(self, project_name, version, location):
+ self.project_name = project_name
+ self.version = version
+ self.location = location
+
+ def call_pkg_resources_require(*args):
+ return [MockPackage("Foo", "1.0", "/path")]
+ self.patch(pkg_resources, 'require', call_pkg_resources_require)
+
+ (packages, errors) = get_package_versions_and_locations()
+ self.failUnlessIn(("foo", ("1.0", "/path", "according to pkg_resources")), packages)
+ self.failIfEqual(errors, [])
+ self.failUnlessEqual([e for e in errors if "was not found by pkg_resources" not in e], [])
+
def test_cross_check_ticket_1355(self):
# The bug in #1355 is triggered when a version string from either pkg_resources or import
# is not parseable at all by normalized_version.
- (errors, extras) = cross_check({"foo": ("unparseable", "")}, [("foo", ("1.0", "", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn("by pkg_resources could not be parsed", errors[0])
+ res = cross_check({"foo": ("unparseable", "")}, [("foo", ("1.0", "", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn("by pkg_resources could not be parsed", res[0])
- (errors, extras) = cross_check({"foo": ("1.0", "")}, [("foo", ("unparseable", "", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn(") could not be parsed", errors[0])
+ res = cross_check({"foo": ("1.0", "")}, [("foo", ("unparseable", "", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn(") could not be parsed", res[0])
def test_cross_check(self):
res = cross_check({}, [])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
res = cross_check({}, [("allmydata-tahoe", ("1.0", "", "blah"))])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
res = cross_check({"foo": ("unparseable", "")}, [])
- self.failUnlessEqual(res, ([], [("foo", ("unparseable", "", "according to pkg_resources"))]))
+ self.failUnlessEqual(res, [])
res = cross_check({"argparse": ("unparseable", "")}, [])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
- (errors, extras) = cross_check({}, [("foo", ("unparseable", "", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn("was not found by pkg_resources", errors[0])
+ res = cross_check({}, [("foo", ("unparseable", "", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn("not found by pkg_resources", res[0])
res = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere", "distribute"))])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
- (errors, extras) = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn("location mismatch", errors[0])
+ res = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn("location mismatch", res[0])
- (errors, extras) = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere_different", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn("location mismatch", errors[0])
+ res = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere_different", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn("location mismatch", res[0])
res = cross_check({"zope.interface": ("1.0", "")}, [("zope.interface", ("unknown", "", None))])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
- (errors, extras) = cross_check({"foo": ("1.0", "")}, [("foo", ("unknown", "", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn("could not find a version number", errors[0])
+ res = cross_check({"foo": ("1.0", "")}, [("foo", ("unknown", "", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn("could not find a version number", res[0])
# When pkg_resources and import both find a package, there is only a warning if both
# the version and the path fail to match.
res = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("2.0", "/somewhere", None))])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
res = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("1.0", "/somewhere_different", None))])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
res = cross_check({"foo": ("1.0-r123", "/somewhere")}, [("foo", ("1.0.post123", "/somewhere_different", None))])
- self.failUnlessEqual(res, ([], []))
+ self.failUnlessEqual(res, [])
- (errors, extras) = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("2.0", "/somewhere_different", None))])
- self.failUnlessEqual(extras, [])
- self.failUnlessEqual(len(errors), 1)
- self.failUnlessIn("but version '2.0'", errors[0])
+ res = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("2.0", "/somewhere_different", None))])
+ self.failUnlessEqual(len(res), 1)
+ self.failUnlessIn("but version '2.0'", res[0])
def test_extract_openssl_version(self):
self.failUnlessEqual(extract_openssl_version(MockSSL("")),