##// END OF EJS Templates
lib: use packaging.version.Version instead of dropped distutils.version.StrictVersion...
Mads Kiilerich -
r8778:a5d15a75 stable
parent child Browse files
Show More
@@ -38,10 +38,10 b' import string'
38 38 import sys
39 39 import time
40 40 import urllib.parse
41 from distutils.version import StrictVersion
42 41
43 42 import bcrypt
44 43 import urlobject
44 from packaging.version import Version
45 45 from sqlalchemy.engine import url as sa_url
46 46 from sqlalchemy.exc import ArgumentError
47 47 from tg import tmpl_context
@@ -494,7 +494,7 b' def check_password(password, hashed):'
494 494 return False
495 495
496 496
497 git_req_ver = StrictVersion('1.7.4')
497 git_req_ver = Version('1.7.4')
498 498
499 499 def check_git_version():
500 500 """
@@ -525,7 +525,7 b' def check_git_version():'
525 525 output = safe_str(stdout).strip()
526 526 m = re.search(r"\d+.\d+.\d+", output)
527 527 if m:
528 ver = StrictVersion(m.group(0))
528 ver = Version(m.group(0))
529 529 log.debug('Git executable: "%s", version %s (parsed from: "%s")',
530 530 settings.GIT_EXECUTABLE_PATH, ver, output)
531 531 if ver < git_req_ver:
@@ -538,7 +538,7 b' def check_git_version():'
538 538 log.error("Terminating ...")
539 539 sys.exit(1)
540 540 else:
541 ver = StrictVersion('0.0.0')
541 ver = Version('0.0.0')
542 542 log.warning('Error finding version number in "%s --version" stdout:\n%s',
543 543 settings.GIT_EXECUTABLE_PATH, output)
544 544
@@ -128,6 +128,7 b' psycopg2'
128 128 docs
129 129 setup
130 130 conftest
131 packaging
131 132 '''.split())
132 133
133 134 normal_modules = set('''
General Comments 0
You need to be logged in to leave comments. Login now