From 7e490e3cdda7e684bb7158d0cb51efdee3b45d47 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 21 Nov 2025 00:37:01 -0600 Subject: [PATCH 1/2] Use strict priority in CI conda tests --- ci/test_cpp.sh | 3 +++ ci/test_python.sh | 3 +++ ci/test_python_distributed.sh | 3 +++ conda/environments/all_cuda-129_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-129_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-130_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-130_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 8 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index b73e7c343..52baa9a71 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -13,6 +13,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-github cpp) 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 + rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ diff --git a/ci/test_python.sh b/ci/test_python.sh index f8fd8bd11..26ca95125 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -13,6 +13,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-github cpp) 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 + rapids-dependency-file-generator \ --output conda \ --file-key test_python \ diff --git a/ci/test_python_distributed.sh b/ci/test_python_distributed.sh index 52bb7cdf7..02f00f5f4 100755 --- a/ci/test_python_distributed.sh +++ b/ci/test_python_distributed.sh @@ -13,6 +13,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-github cpp) 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 + rapids-dependency-file-generator \ --output conda \ --file-key test_python_distributed \ diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index c13d2f5cd..68efca9da 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -1,8 +1,8 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: -- rapidsai - rapidsai-nightly +- rapidsai - conda-forge dependencies: - autoconf diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index e857a5aab..43f86b274 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -1,8 +1,8 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: -- rapidsai - rapidsai-nightly +- rapidsai - conda-forge dependencies: - autoconf diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index 5528cb70d..13583ebb9 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -1,8 +1,8 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: -- rapidsai - rapidsai-nightly +- rapidsai - conda-forge dependencies: - autoconf diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index e16d7a862..dd97d6a17 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -1,8 +1,8 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: -- rapidsai - rapidsai-nightly +- rapidsai - conda-forge dependencies: - autoconf diff --git a/dependencies.yaml b/dependencies.yaml index af1c22b79..d576fa8b3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -159,8 +159,8 @@ files: - depends_on_cupy - depends_on_cudf channels: - - rapidsai - rapidsai-nightly + - rapidsai - conda-forge dependencies: build_cpp: From e13af4fe6e5235aec0aaa8296b381e5c7ed43a34 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Nov 2025 11:47:42 -0600 Subject: [PATCH 2/2] Rerun CI