[arvados] updated: 2.7.0-6020-g10e8d1c10a

[git repository hosting]

Summary of changes:
 build/package-testing/test-package-python3-arvados-python-client.sh | 4 +---
 docker/jobs/Dockerfile                                              | 2 +-
 sdk/cwl/tests/arvados-tests.sh                                      | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

       via  10e8d1c10a0f1192b3999c1fd5be8c41d2af39c6 (commit)
       via  858bf2e3bae0542d5b7da7dd6e1819660ee0c9c0 (commit)
      from  8c33c582e6fa415dbdca5204f5926fe09de34e3b (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 10e8d1c10a0f1192b3999c1fd5be8c41d2af39c6
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Feb 15 16:08:37 2024 -0500

    21453: Update package test with new packaged virtualenv path
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/package-testing/test-package-python3-arvados-python-client.sh b/build/package-testing/test-package-python3-arvados-python-client.sh
index 1e294fe0a8..71668d099c 100755
--- a/build/package-testing/test-package-python3-arvados-python-client.sh
+++ b/build/package-testing/test-package-python3-arvados-python-client.sh
@@ -7,9 +7,7 @@ set -e
 
 arv-put --version >/dev/null
 
-PYTHON=`ls /usr/share/python3*/dist/python3-arvados-python-client/bin/python3 |head -n1`
-
-$PYTHON << EOF
+/usr/lib/python3-arvados-python-client/bin/python <<EOF
 import arvados
 print("Successfully imported arvados")
 EOF

commit 858bf2e3bae0542d5b7da7dd6e1819660ee0c9c0
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Feb 15 15:46:24 2024 -0500

    21453: Update CWL tests with new packaged virtualenv path
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 371b9cc984..05d8547c52 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -20,4 +20,4 @@ RUN /usr/sbin/adduser --disabled-password \
     /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job
 
 USER crunch
-ENV PATH=/usr/share/python3.9/dist/python3-arvados-cwl-runner/bin:/usr/local/bin:/usr/bin:/bin
+ENV PATH=/usr/lib/python3-arvados-cwl-runner/bin:/usr/local/bin:/usr/bin:/bin
diff --git a/sdk/cwl/tests/arvados-tests.sh b/sdk/cwl/tests/arvados-tests.sh
index 8f0c44c553..0cf43405ec 100755
--- a/sdk/cwl/tests/arvados-tests.sh
+++ b/sdk/cwl/tests/arvados-tests.sh
@@ -24,7 +24,7 @@ if ! arv-get 20850f01122e860fb878758ac1320877+71 > /dev/null ; then
 fi
 
 # Use the python executor associated with the installed OS package, if present.
-python=$(((ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python || ls /opt/arvados-py/bin/python || echo python3) | head -n1) 2>/dev/null)
+python="$(PATH="/usr/lib/python3-arvados-cwl-runner/bin:/opt/arvados-py/bin:$PATH" command -v python3)"
 
 # Test for #18888
 # This is a standalone test because the bug was observed with this

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


hooks/post-receive
--