Commit b3ad98c

authored

fix(release): Update merge_package.py (#9694)

Use packaging.version instead of the deprecated distutils.version

1 parent d94b32e commit b3ad98cCopy full SHA for b3ad98c

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`# Written by Ivan Grokhotkov, 2015`
`6`	`6`	`#`
`7`	`7`	`from __future__ import print_function`
`8`		`-from distutils.version import LooseVersion`
	`8`	`+#from distutils.version import LooseVersion`
	`9`	`+from packaging.version import Version`
`9`	`10`	`import re`
`10`	`11`	`import json`
`11`	`12`	`import sys`
`@@ -33,7 +34,7 @@ def merge_objects(versions, obj):`
`33`	`34`	`def pkgVersionNormalized(versionString):`
`34`	`35`
`35`	`36`	`verStr = str(versionString)`
`36`		`- verParts = re.split('\.\|-rc', verStr, flags=re.IGNORECASE)`
	`37`	`+ verParts = re.split('\.\|-rc\|-alpha', verStr, flags=re.IGNORECASE)`
`37`	`38`
`38`	`39`	`if len(verParts) == 3:`
`39`	`40`	`if (sys.version_info > (3, 0)): # Python 3`
`@@ -74,7 +75,8 @@ def main(args):`
`74`	`75`	`print("Adding platform {0}-{1}".format(name, version), file=sys.stderr)`
`75`	`76`	`pkg1['platforms'].append(platforms[name][version])`
`76`	`77`
`77`		`- pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)`
	`78`	`+ #pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)`
	`79`	`+ pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: Version(pkgVersionNormalized(k['version'])), reverse=True)`
`78`	`80`
`79`	`81`	`json.dump({'packages':[pkg1]}, sys.stdout, indent=2)`
`80`	`82`

Comments

(0)