admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix emsdk update-tags command to work on Python 3.

Browse Source
This commit is contained in:
Jukka Jylänki
2017-08-14 13:18:23 +03:00
parent 669e183ce1
commit 04d4f7dbef
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
emsdk
View File

@@ -6,6 +6,7 @@ if sys.version_info >= (3,):
from urllib.parse import urljoin from urllib.parse import urljoin
from urllib.request import urlopen from urllib.request import urlopen
from urllib.error import HTTPError from urllib.error import HTTPError
import functools
else: else:
from urlparse import urljoin from urlparse import urljoin
from urllib2 import urlopen, HTTPError from urllib2 import urlopen, HTTPError
@@ -1458,6 +1459,13 @@ def version_compare(x, y):
b = 1 if is_version_at_least(y, x) else 0 b = 1 if is_version_at_least(y, x) else 0
return a - b return a - b
# A sort function that is compatible with both Python 2 and Python 3 using a custom comparison function.
def python_2_3_sorted(arr, cmp):
if sys.version_info >= (3,):
return sorted(arr, key=functools.cmp_to_key(cmp))
else:
return sorted(arr, cmp=cmp)
def fetch_emscripten_tags(): def fetch_emscripten_tags():
git = GIT(must_succeed=False) git = GIT(must_succeed=False)
if not git: if not git:
@@ -1485,7 +1493,7 @@ def fetch_emscripten_tags():
all_tags += [t] all_tags += [t]
except: except:
pass pass
all_tags = sorted(all_tags, cmp=version_compare) all_tags = python_2_3_sorted(all_tags, cmp=version_compare)
open(sdk_path('emscripten-tags.txt'), 'w').write('\n'.join(all_tags)) open(sdk_path('emscripten-tags.txt'), 'w').write('\n'.join(all_tags))
if len(all_tags) > 0: if len(all_tags) > 0:
print('Done. ' + str(len(all_tags)) + ' tagged releases available, latest is ' + all_tags[-1] + '.') print('Done. ' + str(len(all_tags)) + ' tagged releases available, latest is ' + all_tags[-1] + '.')
@@ -1504,7 +1512,7 @@ def fetch_emscripten_tags():
binaryen_tags += [t] binaryen_tags += [t]
except: except:
pass pass
binaryen_tags = sorted(binaryen_tags, cmp=version_compare) binaryen_tags = python_2_3_sorted(binaryen_tags, cmp=version_compare)
open(sdk_path('binaryen-tags.txt'), 'w').write('\n'.join(binaryen_tags)) open(sdk_path('binaryen-tags.txt'), 'w').write('\n'.join(binaryen_tags))
if len(binaryen_tags) > 0: if len(binaryen_tags) > 0:
print('Done. ' + str(len(binaryen_tags)) + ' tagged Binaryen releases available, latest is ' + binaryen_tags[-1] + '.') print('Done. ' + str(len(binaryen_tags)) + ' tagged Binaryen releases available, latest is ' + binaryen_tags[-1] + '.')
@@ -1599,7 +1607,7 @@ def load_file_index_list(filename):
items = filter(lambda x: 'latest' not in x and len(x) > 0, items) items = filter(lambda x: 'latest' not in x and len(x) > 0, items)
# Sort versions from oldest to newest (the default sort would be lexicographic, i.e. '1.37.1 < 1.37.10 < 1.37.2') # Sort versions from oldest to newest (the default sort would be lexicographic, i.e. '1.37.1 < 1.37.10 < 1.37.2')
items = sorted(items, cmp=sort_by_version)[::-1] items = python_2_3_sorted(items, cmp=sort_by_version)[::-1]
return items return items
except: except: