Skip to content

Commit b3ad98c

Browse files
authored
fix(release): Update merge_package.py (#9694)
Use packaging.version instead of the deprecated distutils.version
1 parent d94b32e commit b3ad98c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Diff for: .github/scripts/merge_packages.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# Written by Ivan Grokhotkov, 2015
66
#
77
from __future__ import print_function
8-
from distutils.version import LooseVersion
8+
#from distutils.version import LooseVersion
9+
from packaging.version import Version
910
import re
1011
import json
1112
import sys
@@ -33,7 +34,7 @@ def merge_objects(versions, obj):
3334
def pkgVersionNormalized(versionString):
3435

3536
verStr = str(versionString)
36-
verParts = re.split('\.|-rc', verStr, flags=re.IGNORECASE)
37+
verParts = re.split('\.|-rc|-alpha', verStr, flags=re.IGNORECASE)
3738

3839
if len(verParts) == 3:
3940
if (sys.version_info > (3, 0)): # Python 3
@@ -74,7 +75,8 @@ def main(args):
7475
print("Adding platform {0}-{1}".format(name, version), file=sys.stderr)
7576
pkg1['platforms'].append(platforms[name][version])
7677

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)
7880

7981
json.dump({'packages':[pkg1]}, sys.stdout, indent=2)
8082

0 commit comments

Comments
 (0)