Remove one more python2 remnant. This is a fix for the

[arvados.git] / build / run-library.sh

diff --git a/build/run-library.sh b/build/run-library.sh
index c925cf1cdea587e0996558fa6b17b0af8f0e9d31..a72aa3ad76875073e2c1bfbcb177a8b8ad0666ee 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -75,25 +75,8 @@ timestamp_from_git() {
 }
 
 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 () {
@@ -707,9 +690,9 @@ fpm_build_virtualenv () {
     done
   fi
 
-  # the python-arvados-cwl-runner package comes with cwltool, expose that version
-  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then
-    COMMAND_ARR+=("usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/")
+  # the python3-arvados-cwl-runner package comes with cwltool, expose that version
+  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then
+    COMMAND_ARR+=("usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/")
   fi
 
   COMMAND_ARR+=(".")