From b7084ab5ece7ad0ebc34c14ed0624f9e8f995ff4 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 15 Mar 2024 09:56:03 -0400 Subject: [PATCH] 19744: Reorder python install steps to address dependency issue. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- build/run-tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/run-tests.sh b/build/run-tests.sh index b9160dedce..1f28915a29 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -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 @@ -1054,6 +1057,7 @@ install_deps() { do_install env do_install cmd/arvados-server go 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 sdk/cli -- 2.30.2