From 1ae929224e5b7520c8ddbce4888cb878cdb22dcb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Oct 2014 10:31:18 -0500 Subject: [PATCH] Fix setup version requirement handling --- setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 83979b1a..838c7410 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ for line in data.splitlines(): version.append(int(part)) except ValueError: pass - DEPENDENCIES[pkg.lower()] = tuple(version) + DEPENDENCIES[str(pkg.lower())] = tuple(version) def configuration(parent_package='', top_path=None): @@ -86,20 +86,19 @@ def get_package_version(package): parts = re.split('\D+', version_info) except TypeError: continue + version = [] for part in parts: try: version.append(int(part)) except ValueError: pass - return tuple(version) - + return tuple(version) def check_requirements(): if sys.version_info < PYTHON_VERSION: raise SystemExit('You need Python version %d.%d or later.' \ % PYTHON_VERSION) - for package_name, min_version in DEPENDENCIES.items(): if package_name == 'cython': package_name = 'Cython' @@ -115,7 +114,6 @@ def check_requirements(): package_version = get_package_version(package) if min_version > package_version: dep_error = True - if dep_error: raise ImportError('You need `%s` version %s or later.' \ % (package_name, '.'.join(str(i) for i in min_version)))