From 31ef81c558183833274dc0e25c270ff14cbd5e0d Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 9 Oct 2024 18:11:37 -0500
Subject: [PATCH] make conda installs in CI stricter

---
 ci/build_docs.sh     | 9 ++++-----
 ci/test_notebooks.sh | 4 +++-
 ci/test_python.sh    | 4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index 6d39b97c..80702ed8 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -5,6 +5,8 @@ set -euo pipefail
 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 docs \
@@ -21,11 +23,8 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 rapids-mamba-retry install \
     --channel "${PYTHON_CHANNEL}" \
-    cuxfilter
+    "cuxfilter=${RAPIDS_VERSION}"
 
-export RAPIDS_VERSION="$(rapids-version)"
-export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
-export RAPIDS_VERSION_NUMBER="$RAPIDS_VERSION_MAJOR_MINOR"
 export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
 rapids-logger "Build Python docs"
@@ -35,4 +34,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/cuxfilter/"html
 mv _html/* "${RAPIDS_DOCS_DIR}/cuxfilter/html"
 popd
 
-rapids-upload-docs
+RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)" rapids-upload-docs
diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh
index 730129f0..949525bd 100755
--- a/ci/test_notebooks.sh
+++ b/ci/test_notebooks.sh
@@ -5,6 +5,8 @@ set -euo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
 
+RAPIDS_VERSION="$(rapids-version)"
+
 rapids-logger "Generate notebook testing dependencies"
 rapids-dependency-file-generator \
   --output conda \
@@ -25,7 +27,7 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 rapids-mamba-retry install \
   --channel "${PYTHON_CHANNEL}" \
-  cuxfilter
+  "cuxfilter=${RAPIDS_VERSION}"
 
 
 NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")"
diff --git a/ci/test_python.sh b/ci/test_python.sh
index 0d6c834b..60cc36ab 100755
--- a/ci/test_python.sh
+++ b/ci/test_python.sh
@@ -5,6 +5,8 @@ set -euo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
 
+RAPIDS_VERSION="$(rapids-version)"
+
 rapids-logger "Generate Python testing dependencies"
 rapids-dependency-file-generator \
   --output conda \
@@ -29,7 +31,7 @@ rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${PYTHON_CHANNEL}" \
-  cuxfilter
+  "cuxfilter=${RAPIDS_VERSION}"
 
 rapids-logger "Check GPU usage"
 nvidia-smi