# version.
cwl_runner_version_tag=$(echo -n $cwl_runner_version | sed s/~dev/.dev/g | sed s/~rc/rc/g)
+if [[ -z "$cwl_runner_version_tag" ]]; then
+ echo "ERROR: cwl_runner_version_tag is empty";
+ exit 1
+fi
+
if [[ "${cwl_runner_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then
cwl_runner_version="${cwl_runner_version}-1"
else
}
calculate_python_sdk_cwl_package_versions() {
- python_sdk_ts=$(cd sdk/python && timestamp_from_git)
- cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git)
- build_ts=$(cd build && timestamp_from_git version-at-commit.sh)
-
- ar=($python_sdk_ts $cwl_runner_ts $build_ts)
- OLDIFS=$IFS
- IFS=$'\n'
- max=`echo "${ar[*]}" | sort -nr | head -n1`
- IFS=$OLDIFS
-
- python_sdk_version=$(cd sdk/python && nohash_version_from_git)
- cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git)
- build_version=$(cd build && nohash_version_from_git version-at-commit.sh)
-
- if [[ $max -eq $build_ts ]]; then
- cwl_runner_version=$build_version
- elif [[ $max -eq $python_sdk_ts ]]; then
- cwl_runner_version=$python_sdk_version
- fi
+ python_sdk_version=$(cd sdk/python && python3 arvados_version.py)
+ cwl_runner_version=$(cd sdk/cwl && python3 arvados_version.py)
}
handle_python_package () {
import time
import os
import re
+import sys
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
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():
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)
+
+# Called from calculate_python_sdk_cwl_package_versions() in run-library.sh
+if __name__ == '__main__':
+ print(get_version(SETUP_DIR, "arvados_cwl"))
import time
import os
import re
+import sys
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
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():
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)
+
+# Called from calculate_python_sdk_cwl_package_versions() in run-library.sh
+if __name__ == '__main__':
+ print(get_version(SETUP_DIR, "arvados"))
import time
import os
import re
+import sys
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
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():
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)
import time
import os
import re
+import sys
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
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():
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)
import time
import os
import re
+import sys
SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_PATHS = {
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():
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)