From 7cb883999cc8de56eaa4d3ff44b05ee018050ccc Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Oct 2014 15:34:33 -0500 Subject: [PATCH] Use strings as required by LooseVersion --- setup.py | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py index 2a3cb690..a211fb7a 100755 --- a/setup.py +++ b/setup.py @@ -39,13 +39,7 @@ for line in data.splitlines(): # Only require Cython if we have a developer checkout if pkg.lower() == 'cython' and not VERSION.endswith('dev'): continue - version = [] - for part in re.split('\D+', version_info): - try: - version.append(int(part)) - except ValueError: - pass - DEPENDENCIES[str(pkg.lower())] = tuple(version) + DEPENDENCIES[str(pkg.lower())] = str(version_info) def configuration(parent_package='', top_path=None): @@ -83,18 +77,8 @@ version='%s' def get_package_version(package): for version_attr in ('version', 'VERSION', '__version__'): version_info = getattr(package, version_attr, None) - try: - 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) + if version_info: + return str(version_info) def check_requirements(): if sys.version_info < PYTHON_VERSION: