Merge branch 'branch-23.12' into enh_nbr_intersection_edge_masking

rapidsai · Oct 26, 2023 · 1abf1b9 · 1abf1b9
2 parents 29b68a0 + c90fd94
commit 1abf1b9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/ci/test_wheel_cugraph.sh b/ci/test_wheel_cugraph.sh
@@ -9,6 +9,6 @@ RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-whe
 python -m pip install --no-deps ./local-pylibcugraph-dep/pylibcugraph*.whl
 
 # Always install latest dask for testing
-python -m pip install git+https://github.com/dask/dask.git@2023.9.2 git+https://github.com/dask/distributed.git@2023.9.2
+python -m pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main
 
 ./ci/test_wheel.sh cugraph python/cugraph
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -20,7 +20,7 @@ dependencies:
 - cupy>=12.0.0
 - cxx-compiler
 - cython>=3.0.0
-- dask-core==2023.9.2
+- dask-core>=2023.9.2
 - dask-cuda==23.12.*
 - dask-cudf==23.12.*
 - dask>=2023.7.1

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -20,7 +20,7 @@ dependencies:
 - cupy>=12.0.0
 - cxx-compiler
 - cython>=3.0.0
-- dask-core==2023.9.2
+- dask-core>=2023.9.2
 - dask-cuda==23.12.*
 - dask-cudf==23.12.*
 - dask>=2023.7.1

diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml
@@ -26,7 +26,7 @@ requirements:
     - python
     - scikit-build >=0.13.1
   run:
-    - distributed ==2023.9.2
+    - distributed >=2023.9.2
     - numba >=0.57
     - numpy >=1.21
     - python

diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml
@@ -59,7 +59,7 @@ outputs:
         - cupy >=12.0.0
         - dask-cuda ={{ minor_version }}
         - dask-cudf ={{ minor_version }}
-        - distributed ==2023.9.2
+        - distributed >=2023.9.2
         - numba >=0.57
         - numpy >=1.21
         - python

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -76,9 +76,9 @@ requirements:
     - cupy >=12.0.0
     - dask-cuda ={{ minor_version }}
     - dask-cudf ={{ minor_version }}
-    - dask ==2023.9.2
-    - dask-core ==2023.9.2
-    - distributed ==2023.9.2
+    - dask >=2023.9.2
+    - dask-core >=2023.9.2
+    - distributed >=2023.9.2
     - fsspec>=0.6.0
     - libcugraph ={{ version }}
     - pylibcugraph ={{ version }}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -385,7 +385,7 @@ dependencies:
       - output_types: conda
         packages:
           - aiohttp
-          - &dask-core_conda dask-core==2023.9.2
+          - &dask-core_conda dask-core>=2023.9.2
           - fsspec>=0.6.0
           - libcudf==23.12.*
           - requests