Merge remote-tracking branch 'origin/branch-0.20' into range-queries-20

rapidsai · Apr 6, 2021 · 69a3c31 · 69a3c31
2 parents 7a89ba6 + 153f96a
commit 69a3c31
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/conda/environments/cudf_dev_cuda10.1.yml b/conda/environments/cudf_dev_cuda10.1.yml
@@ -42,8 +42,8 @@ dependencies:
   - mypy=0.782
   - typing_extensions
   - pre_commit
-  - dask==2021.3.1
-  - distributed>=2.22.0,<=2021.3.1
+  - dask==2021.4.0
+  - distributed>=2.22.0,<=2021.4.0
   - streamz
   - dlpack
   - arrow-cpp=1.0.1

diff --git a/conda/environments/cudf_dev_cuda10.2.yml b/conda/environments/cudf_dev_cuda10.2.yml
@@ -42,8 +42,8 @@ dependencies:
   - mypy=0.782
   - typing_extensions
   - pre_commit
-  - dask==2021.3.1
-  - distributed>=2.22.0,<=2021.3.1
+  - dask==2021.4.0
+  - distributed>=2.22.0,<=2021.4.0
   - streamz
   - dlpack
   - arrow-cpp=1.0.1

diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml
@@ -42,8 +42,8 @@ dependencies:
   - mypy=0.782
   - typing_extensions
   - pre_commit
-  - dask==2021.3.1
-  - distributed>=2.22.0,<=2021.3.1
+  - dask==2021.4.0
+  - distributed>=2.22.0,<=2021.4.0
   - streamz
   - dlpack
   - arrow-cpp=1.0.1

diff --git a/conda/environments/cudf_dev_cuda11.1.yml b/conda/environments/cudf_dev_cuda11.1.yml
@@ -42,8 +42,8 @@ dependencies:
   - mypy=0.782
   - typing_extensions
   - pre_commit
-  - dask==2021.3.1
-  - distributed>=2.22.0,<=2021.3.1
+  - dask==2021.4.0
+  - distributed>=2.22.0,<=2021.4.0
   - streamz
   - dlpack
   - arrow-cpp=1.0.1

diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml
@@ -42,8 +42,8 @@ dependencies:
   - mypy=0.782
   - typing_extensions
   - pre_commit
-  - dask==2021.3.1
-  - distributed>=2.22.0,<=2021.3.1
+  - dask==2021.4.0
+  - distributed>=2.22.0,<=2021.4.0
   - streamz
   - dlpack
   - arrow-cpp=1.0.1

diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml
@@ -28,8 +28,8 @@ requirements:
     - python
     - streamz 
     - cudf {{ version }}
-    - dask >=2.22.0
-    - distributed >=2.22.0,<=2021.3.1
+    - dask >=2.22.0,<=2021.4.0
+    - distributed >=2.22.0,<=2021.4.0
     - python-confluent-kafka
     - cudf_kafka {{ version }}
 

diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml
@@ -23,13 +23,13 @@ requirements:
   host:
     - python
     - cudf {{ version }}
-    - dask==2021.3.1
-    - distributed >=2.22.0,<=2021.3.1
+    - dask==2021.4.0
+    - distributed >=2.22.0,<=2021.4.0
   run:
     - python
     - cudf {{ version }}
-    - dask==2021.3.1
-    - distributed >=2.22.0,<=2021.3.1
+    - dask==2021.4.0
+    - distributed >=2.22.0,<=2021.4.0
 
 test:
   requires:

diff --git a/python/custreamz/dev_requirements.txt b/python/custreamz/dev_requirements.txt
@@ -3,8 +3,8 @@
 flake8==3.8.3
 black==19.10b0
 isort==5.0.7
-dask==2021.3.1
-distributed>=2.22.0,<=2021.3.1
+dask==2021.4.0
+distributed>=2.22.0,<=2021.4.0
 streamz
 python-confluent-kafka
 pytest

diff --git a/python/dask_cudf/dev_requirements.txt b/python/dask_cudf/dev_requirements.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, NVIDIA CORPORATION.
 
-dask==2021.3.1
-distributed>=2.22.0,<=2021.3.1
+dask==2021.4.0
+distributed>=2.22.0,<=2021.4.0
 fsspec>=0.6.0
 numba>=0.49.0,!=0.51.0
 numpy

diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py
@@ -10,8 +10,8 @@
 
 install_requires = [
     "cudf",
-    "dask==2021.3.1",
-    "distributed>=2.22.0,<=2021.3.1",
+    "dask==2021.4.0",
+    "distributed>=2.22.0,<=2021.4.0",
     "fsspec>=0.6.0",
     "numpy",
     "pandas>=1.0,<1.3.0dev0",
@@ -23,8 +23,8 @@
         "pandas>=1.0,<1.3.0dev0",
         "pytest",
         "numba>=0.49.0,!=0.51.0",
-        "dask==2021.3.1",
-        "distributed>=2.22.0,<=2021.3.1",
+        "dask==2021.4.0",
+        "distributed>=2.22.0,<=2021.4.0",
     ]
 }