fix package names and update update scripts

rapidsai · Nov 8, 2023 · ff3aa2a · ff3aa2a
1 parent d500828
commit ff3aa2a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -57,6 +57,7 @@ DEPENDENCIES=(
   dask-cuda
   pylibraft
   rmm
+  rapids-dask-dependency
   # ucx-py is handled separately below
 )
 for FILE in dependencies.yaml conda/environments/*.yaml; do
@@ -75,11 +76,6 @@ done
 
 sed_runner "/^ucx_py_version:$/ {n;s/.*/  - \"${NEXT_UCX_PY_VERSION}\"/}" conda/recipes/raft-dask/conda_build_config.yaml
 
-# Wheel builds install dask-cuda from source, update its branch
-for FILE in .github/workflows/*.yaml; do
-  sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE};
-done
-
 for FILE in .github/workflows/*.yaml; do
   sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
 done

diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -46,7 +46,7 @@ dependencies:
 - pydata-sphinx-theme
 - pytest
 - pytest-cov
-- rapids-dask-dependency==23.12.00.*
+- rapids-dask-dependency==23.12.*
 - recommonmark
 - rmm==23.12.*
 - scikit-build>=0.13.1

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -46,7 +46,7 @@ dependencies:
 - pydata-sphinx-theme
 - pytest
 - pytest-cov
-- rapids-dask-dependency==23.12.00.*
+- rapids-dask-dependency==23.12.*
 - recommonmark
 - rmm==23.12.*
 - scikit-build>=0.13.1

diff --git a/conda/environments/all_cuda-120_arch-aarch64.yaml b/conda/environments/all_cuda-120_arch-aarch64.yaml
@@ -42,7 +42,7 @@ dependencies:
 - pydata-sphinx-theme
 - pytest
 - pytest-cov
-- rapids-dask-dependency==23.12.00.*
+- rapids-dask-dependency==23.12.*
 - recommonmark
 - rmm==23.12.*
 - scikit-build>=0.13.1

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -42,7 +42,7 @@ dependencies:
 - pydata-sphinx-theme
 - pytest
 - pytest-cov
-- rapids-dask-dependency==23.12.00.*
+- rapids-dask-dependency==23.12.*
 - recommonmark
 - rmm==23.12.*
 - scikit-build>=0.13.1

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -440,16 +440,15 @@ dependencies:
           - joblib>=0.11
           - numba>=0.57
           - *numpy
+          - rapids-dask-dependency==23.12.*
           - ucx-py==0.35.*
       - output_types: conda
         packages:
-          - rapids-dask-dependency==23.12.00.*
           - ucx>=1.13.0
           - ucx-proc=*=gpu
           - &ucx_py_conda ucx-py==0.35.*
       - output_types: pyproject
         packages:
-          - rapids-dask-dependency==23.12.*
           - &pylibraft_conda pylibraft==23.12.*
       - output_types: requirements
         packages: