Reorder python install steps to address dependency issue.
authorTom Clegg <tom@curii.com>
Fri, 15 Mar 2024 16:01:22 +0000 (12:01 -0400)
committerTom Clegg <tom@curii.com>
Fri, 15 Mar 2024 16:01:22 +0000 (12:01 -0400)
refs #19744

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

build/run-tests.sh

index 55615a2985ce7159a6d8900510cd51bb381cb858..fa0abbc07cd3c534d37fe1908f6a6fd51c217ca4 100755 (executable)
@@ -971,11 +971,14 @@ install_services/api() {
 
 declare -a pythonstuff
 pythonstuff=(
+    # The ordering of sdk/python, tools/crunchstat-summary, and
+    # sdk/cwl here is significant. See
+    # https://dev.arvados.org/issues/19744#note-26
     sdk/python:py3
+    tools/crunchstat-summary:py3
     sdk/cwl:py3
     services/dockercleaner:py3
     services/fuse:py3
-    tools/crunchstat-summary:py3
 )
 
 declare -a gostuff
@@ -1055,6 +1058,7 @@ install_deps() {
     do_install cmd/arvados-server go
     do_install sdk/cli
     do_install sdk/python pip "${VENV3DIR}/bin/"
+    do_install tools/crunchstat-summary pip "${VENV3DIR}/bin/"
     do_install sdk/ruby-google-api-client
     do_install sdk/ruby
     do_install services/api