[arvados] updated: 2.7.0-5676-gd9389508ca

git repository hosting git at public.arvados.org
Thu Jan 4 22:47:20 UTC 2024


Summary of changes:
 build/run-library.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  d9389508ca23405edc3cd120a181bcf89d5d8d57 (commit)
      from  9b0c0a3b653c724b014a533367892b1fc457686f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d9389508ca23405edc3cd120a181bcf89d5d8d57
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Jan 4 17:45:44 2024 -0500

    20846: Python package build uses one specific Python version
    
    This is meant to prevent all kinds of weird problems that can arise if
    `python3` ever stops being the same version that we used to build the
    package.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 17ac4586a0..883219d67c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -694,8 +694,7 @@ fpm_build_virtualenv_worker () {
     ARVADOS_BUILDING_ITERATION=1
   fi
 
-  local python=$PYTHON3_EXECUTABLE
-  pip=pip3
+  local python="python$PYTHON3_VERSION"
   PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX
 
   if [[ "$PKG" != "arvados-docker-cleaner" ]]; then
@@ -715,7 +714,7 @@ fpm_build_virtualenv_worker () {
     exit 1
   fi
 
-  local venv_py="$venv_dir/bin/python3"
+  local venv_py="$venv_dir/bin/$python"
   if ! "$venv_py" -m pip install --upgrade $DASHQ_UNLESS_DEBUG $CACHE_FLAG pip setuptools wheel; then
     printf "Error, unable to upgrade pip, setuptools, and wheel with
   %s -m pip install --upgrade $DASHQ_UNLESS_DEBUG $CACHE_FLAG pip setuptools wheel

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list