projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15655-logtail-encoding'
[arvados.git]
/
sdk
/
python
/
arvados_version.py
diff --git
a/sdk/python/arvados_version.py
b/sdk/python/arvados_version.py
index 3be72b51f09f0da2ea9ace87531840ef84a2e35d..692146465216448b7cb3f95fa8ce20bf8beff83c 100644
(file)
--- a/
sdk/python/arvados_version.py
+++ b/
sdk/python/arvados_version.py
@@
-9,7
+9,7
@@
import re
def git_latest_tag():
gittags = subprocess.check_output(['git', 'tag', '-l']).split()
def git_latest_tag():
gittags = subprocess.check_output(['git', 'tag', '-l']).split()
- gittags.sort(key=lambda s:
map(int, s.split('.'))
,reverse=True)
+ gittags.sort(key=lambda s:
[int(u) for u in s.split(b'.')]
,reverse=True)
return str(next(iter(gittags)).decode('utf-8'))
def git_timestamp_tag():
return str(next(iter(gittags)).decode('utf-8'))
def git_timestamp_tag():
@@
-34,7
+34,7
@@
def get_version(setup_dir, module):
else:
try:
save_version(setup_dir, module, git_latest_tag() + git_timestamp_tag())
else:
try:
save_version(setup_dir, module, git_latest_tag() + git_timestamp_tag())
- except
subprocess.CalledProcessError
:
+ except
(subprocess.CalledProcessError, OSError)
:
pass
return read_version(setup_dir, module)
pass
return read_version(setup_dir, module)