projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19830-pysdk-util-docs'
[arvados.git]
/
sdk
/
python
/
arvados_version.py
diff --git
a/sdk/python/arvados_version.py
b/sdk/python/arvados_version.py
index 154a566074dbdcaba2a122eaf43eee0e54825633..092131d930aeddf880eae21a521d59f4122b7404 100644
(file)
--- a/
sdk/python/arvados_version.py
+++ b/
sdk/python/arvados_version.py
@@
-6,6
+6,7
@@
import subprocess
import time
import os
import re
import time
import os
import re
+import sys
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
@@
-22,7
+23,7
@@
def choose_version_from():
sorted_ts = sorted(ts.items())
getver = sorted_ts[-1][1]
sorted_ts = sorted(ts.items())
getver = sorted_ts[-1][1]
- print("Using "+getver+" for version number calculation of "+SETUP_DIR)
+ print("Using "+getver+" for version number calculation of "+SETUP_DIR
, file=sys.stderr
)
return getver
def git_version_at_commit():
return getver
def git_version_at_commit():
@@
-50,7
+51,11
@@
def get_version(setup_dir, module):
try:
save_version(setup_dir, module, git_version_at_commit())
except (subprocess.CalledProcessError, OSError) as err:
try:
save_version(setup_dir, module, git_version_at_commit())
except (subprocess.CalledProcessError, OSError) as err:
- print("ERROR: {0}".format(err))
+ print("ERROR: {0}".format(err)
, file=sys.stderr
)
pass
return read_version(setup_dir, module)
pass
return read_version(setup_dir, module)
+
+# Called from calculate_python_sdk_cwl_package_versions() in run-library.sh
+if __name__ == '__main__':
+ print(get_version(SETUP_DIR, "arvados"))