Update Conda channels to prioritize conda-forge over nvidia (#436)

Closes #435 Closes #424 Closes #423 Closes #422 Authors: - Christopher Harris (https://github.com/cwharris) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: #436
nv-morpheus · Feb 7, 2024 · cf3d20f · cf3d20f
1 parent 00dfd7b
commit cf3d20f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh
@@ -98,9 +98,8 @@ if hasArg quick; then
    CONDA_ARGS_ARRAY+=("--variants" "{rapids_version: 24.02}")
 fi
 
-CONDA_ARGS_ARRAY+=("--keep-old-work")
-# And default channels
-CONDA_ARGS_ARRAY+=("-c" "conda-forge" "-c" "rapidsai-nightly" "-c" "nvidia")
+# And default channels (should match dependencies.yaml)
+CONDA_ARGS_ARRAY+=("-c" "conda-forge" "-c" "rapidsai" "-c" "rapidsai-nightly" "-c" "nvidia")
 
 # Set GIT_VERSION to set the project version inside of meta.yaml
 export GIT_VERSION="$(get_version)"

diff --git a/conda/environments/all_cuda-121_arch-x86_64.yaml b/conda/environments/all_cuda-121_arch-x86_64.yaml
@@ -3,9 +3,8 @@
 channels:
 - conda-forge
 - rapidsai
-- nvidia/label/cuda-12.1.1
-- nvidia
 - rapidsai-nightly
+- nvidia
 dependencies:
 - bash-completion
 - benchmark=1.8.3

diff --git a/conda/environments/ci_cuda-121_arch-x86_64.yaml b/conda/environments/ci_cuda-121_arch-x86_64.yaml
@@ -3,9 +3,8 @@
 channels:
 - conda-forge
 - rapidsai
-- nvidia/label/cuda-12.1.1
-- nvidia
 - rapidsai-nightly
+- nvidia
 dependencies:
 - benchmark=1.8.3
 - boost-cpp=1.84

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -38,13 +38,11 @@ files:
     includes:
       - checks
 
-
 channels:
   - conda-forge
   - rapidsai
-  - nvidia/label/cuda-12.1.1
-  - nvidia
   - rapidsai-nightly
+  - nvidia
 
 dependencies: