From 997c6ff9abcf2089e376caac5762c0fc37e02065 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 2 Dec 2025 14:37:14 -0600 Subject: [PATCH 1/3] Use strict priority in CI conda tests --- ci/build_docs.sh | 3 +++ ci/check_style.sh | 3 +++ ci/cpp_linters.sh | 3 +++ ci/discover_libcudf_tests.sh | 3 +++ ci/run_compute_sanitizer_test.sh | 3 +++ ci/test_java.sh | 3 +++ ci/test_notebooks.sh | 3 +++ 7 files changed, 21 insertions(+) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 8f45eb7dff7..3d8aa8cc70c 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -12,6 +12,9 @@ export RAPIDS_VERSION_MAJOR_MINOR rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + ENV_YAML_DIR="$(mktemp -d)" rapids-logger "Downloading artifacts from previous jobs" diff --git a/ci/check_style.sh b/ci/check_style.sh index bbbba20439a..682d00e142c 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -7,6 +7,9 @@ set -euo pipefail rapids-logger "Create checks conda environment" . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + ENV_YAML_DIR="$(mktemp -d)" rapids-dependency-file-generator \ diff --git a/ci/cpp_linters.sh b/ci/cpp_linters.sh index a756642e0f6..bae15a0209f 100755 --- a/ci/cpp_linters.sh +++ b/ci/cpp_linters.sh @@ -7,6 +7,9 @@ set -euo pipefail rapids-logger "Create checks conda environment" . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + ENV_YAML_DIR="$(mktemp -d)" rapids-dependency-file-generator \ diff --git a/ci/discover_libcudf_tests.sh b/ci/discover_libcudf_tests.sh index 9c47de76a4a..c4e5aee0eea 100755 --- a/ci/discover_libcudf_tests.sh +++ b/ci/discover_libcudf_tests.sh @@ -6,6 +6,9 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + rapids-logger "Generate C++ testing dependencies" ENV_YAML_DIR="$(mktemp -d)" diff --git a/ci/run_compute_sanitizer_test.sh b/ci/run_compute_sanitizer_test.sh index ece972da185..1185c581275 100755 --- a/ci/run_compute_sanitizer_test.sh +++ b/ci/run_compute_sanitizer_test.sh @@ -6,6 +6,9 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + # This script runs compute-sanitizer on a single libcudf test executable # Usage: ./run_compute_sanitizer_test.sh TOOL_NAME TEST_NAME [additional gtest args...] # Example: ./run_compute_sanitizer_test.sh memcheck AST_TEST diff --git a/ci/test_java.sh b/ci/test_java.sh index 444467ad4b1..dfc35517566 100755 --- a/ci/test_java.sh +++ b/ci/test_java.sh @@ -6,6 +6,9 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-github cpp) diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index df933e1a9d3..d0298eead0b 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -6,6 +6,9 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Configuring conda strict channel priority" +conda config --set channel_priority strict + rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-github cpp) PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-package-name conda_python cudf)") From 36dd8f9a3fc681f8f153a8b0882b9a3d1466ea05 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 2 Dec 2025 14:46:04 -0600 Subject: [PATCH 2/3] Fix permissions --- ci/build_python_noarch.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/build_python_noarch.sh diff --git a/ci/build_python_noarch.sh b/ci/build_python_noarch.sh old mode 100644 new mode 100755 From a1433648f5129fa9d9ba39342ceb8a6a45e194dd Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 2 Dec 2025 16:32:21 -0600 Subject: [PATCH 3/3] Add noarch channel to docs builds --- ci/build_docs.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 3d8aa8cc70c..b1323ca3e1f 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -19,13 +19,15 @@ ENV_YAML_DIR="$(mktemp -d)" rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-github cpp) -PYTHON_CHANNEL=$(rapids-download-conda-from-github python) +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-package-name conda_python cudf)") +PYTHON_NOARCH_CHANNEL=$(rapids-download-from-github "$(rapids-package-name conda_python cudf-noarch --pure --cuda "${RAPIDS_CUDA_VERSION}")") rapids-dependency-file-generator \ --output conda \ --file-key docs \ --prepend-channel "${CPP_CHANNEL}" \ --prepend-channel "${PYTHON_CHANNEL}" \ + --prepend-channel "${PYTHON_NOARCH_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml" rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n docs