From a1517ee94d90e5d4127858023e141021d9a117c9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 9 Oct 2024 19:16:59 -0500 Subject: [PATCH 1/3] make conda installs in CI stricter --- ci/test_python.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/test_python.sh b/ci/test_python.sh index c42fb613..b77f4a61 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -9,6 +9,8 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION="$(rapids-version)" + rapids-dependency-file-generator \ --output conda \ --file-key test_python \ @@ -50,7 +52,7 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) rapids-mamba-retry install \ --channel "${PYTHON_CHANNEL}" \ - ucx-py + "ucx-py=${RAPIDS_VERSION}" rapids-logger "Run tests with conda package" run_tests From 3c97bb19f4753f8469bab971342ed0682e3754d1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 09:28:18 -0500 Subject: [PATCH 2/3] variable name --- ci/test_python.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test_python.sh b/ci/test_python.sh index b77f4a61..fc8d9c59 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -9,7 +9,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -RAPIDS_VERSION="$(rapids-version)" +UCX_PY_VERSION="$(rapids-version)" rapids-dependency-file-generator \ --output conda \ @@ -52,7 +52,7 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) rapids-mamba-retry install \ --channel "${PYTHON_CHANNEL}" \ - "ucx-py=${RAPIDS_VERSION}" + "ucx-py=${UCX_PY_VERSION}" rapids-logger "Run tests with conda package" run_tests From 21ab224b98111842a4d8bedffa3086f536969c94 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 09:59:33 -0500 Subject: [PATCH 3/3] rapids-version does not work in this repo --- ci/test_python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test_python.sh b/ci/test_python.sh index fc8d9c59..c3e7acdf 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -9,7 +9,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCX_PY_VERSION="$(rapids-version)" +UCX_PY_VERSION="$(head -1 ./VERSION)" rapids-dependency-file-generator \ --output conda \