Merge pull request #1156 from rapidsai/branch-23.04

Forward-merge branch-23.04 to branch-23.06
rapidsai · Apr 5, 2023 · 80596bd · 80596bd
2 parents 9739314 + 1f51c4f
commit 80596bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/conda/recipes/dask-cuda/meta.yaml b/conda/recipes/dask-cuda/meta.yaml
@@ -33,6 +33,7 @@ requirements:
     - versioneer >=0.24
   run:
     - python
+    - dask-core ==2023.3.2
     {% for r in data.get("project", {}).get("dependencies", []) %}
     - {{ r }}
     {% endfor %}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -96,13 +96,15 @@ dependencies:
       - output_types: [conda, requirements]
         packages:
           - dask==2023.3.2
-          - dask-core==2023.3.2
           - distributed==2023.3.2.1
           - numba>=0.54
           - numpy>=1.21
           - pandas>=1.3,<1.6.0dev0
           - pynvml>=11.0.0,<11.5
           - zict>=0.1.3
+      - output_types: [conda]
+        packages:
+          - dask-core==2023.3.2
   test_python:
     common:
       - output_types: [conda]

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,6 @@ license = { text = "Apache-2.0" }
 requires-python = ">=3.8"
 dependencies = [
     "dask ==2023.3.2",
-    "dask-core ==2023.3.2",
     "distributed ==2023.3.2.1",
     "pynvml >=11.0.0,<11.5",
     "numpy >=1.21",