FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 01:46:15 +01:00
Code Issues Projects Releases Wiki Activity

Provide a replacement for distutils.version.LooseVersion

Browse Source
This commit is contained in:
Thomas Nagy 2022-12-22 18:31:36 +01:00
parent 240555a979
commit 69c95b5341
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
waflib/Tools/python.py
View File

@ -585,13 +585,12 @@ def check_python_module(conf, module_name, condition=''):
if ret == 'unknown version': if ret == 'unknown version':
conf.fatal('Could not check the %s version' % module_name) conf.fatal('Could not check the %s version' % module_name)
from distutils.version import LooseVersion
def num(*k): def num(*k):
if isinstance(k[0], int): if isinstance(k[0], int):
return LooseVersion('.'.join([str(x) for x in k])) return Utils.loose_version('.'.join([str(x) for x in k]))
else: else:
return LooseVersion(k[0]) return Utils.loose_version(k[0])
d = {'num': num, 'ver': LooseVersion(ret)} d = {'num': num, 'ver': Utils.loose_version(ret)}
ev = eval(condition, {}, d) ev = eval(condition, {}, d)
if not ev: if not ev:
conf.fatal('The %s version does not satisfy the requirements' % module_name) conf.fatal('The %s version does not satisfy the requirements' % module_name)

13
waflib/Utils.py
View File

@ -870,6 +870,19 @@ def lib64():
return '64' return '64'
return '' return ''
def loose_version(ver_str):
# private for the time being!
# see #2402
lst = re.split(r'([.]|\\d+|[a-zA-Z])', ver_str)
ver = []
for i, val in enumerate(lst):
try:
ver.append(int(val))
except ValueError:
if val != '.':
ver.append(val)
return ver
def sane_path(p): def sane_path(p):
# private function for the time being! # private function for the time being!
return os.path.abspath(os.path.expanduser(p)) return os.path.abspath(os.path.expanduser(p))