X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f99e500a39b96f15c2814b742737b2f234766bbd..2eb7828c9913698174d8b565afc4583894de5c21:/build/run-build-packages-python-and-ruby.sh

diff --git a/build/run-build-packages-python-and-ruby.sh b/build/run-build-packages-python-and-ruby.sh
index 599fe7cf96..141435a3a2 100755
--- a/build/run-build-packages-python-and-ruby.sh
+++ b/build/run-build-packages-python-and-ruby.sh
@@ -51,12 +51,19 @@ gem_wrapper() {
 
 handle_python_package () {
   # This function assumes the current working directory is the python package directory
-  if [ -n "$(find dist -name "*-$(nohash_version_from_git).tar.gz" -print -quit)" ]; then
+  local -a pkg_fmts=()
+  local version="$(nohash_version_from_git)"
+  if [[ -z "$(find dist -name "*-$version.tar.gz" -print -quit)" ]]; then
+    pkg_fmts+=(sdist)
+  fi
+  if [[ -z "$(find dist -name "*-$version-py*.whl" -print -quit)" ]]; then
+    pkg_fmts+=(bdist_wheel)
+  fi
+  if [[ "${#pkg_fmts[@]}" -eq 0 ]]; then
     echo "This package doesn't need rebuilding."
-    return
+  else
+    python3 setup.py $DASHQ_UNLESS_DEBUG "${pkg_fmts[@]}"
   fi
-  # Make sure only to use sdist - that's the only format pip can deal with (sigh)
-  python3 setup.py $DASHQ_UNLESS_DEBUG sdist
 }
 
 python_wrapper() {
@@ -165,13 +172,6 @@ if [ $RUBY -eq 0 ] && [ $PYTHON -eq 0 ]; then
   exit 0
 fi
 
-if [[ -f /etc/profile.d/rvm.sh ]]; then
-    source /etc/profile.d/rvm.sh
-    GEM="rvm-exec default gem"
-else
-    GEM=gem
-fi
-
 # Make all files world-readable -- jenkins runs with umask 027, and has checked
 # out our git tree here
 chmod o+r "$WORKSPACE" -R