From 41d9dab2e03e962f0d2d4a568fd8c98b69464d4f Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Fri, 19 Nov 2021 08:21:27 -0800 Subject: [PATCH 1/3] pin max dask version --- ci/benchmark/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/environments/cudf_dev_cuda11.0.yml | 4 ++-- conda/environments/cudf_dev_cuda11.2.yml | 4 ++-- conda/environments/cudf_dev_cuda11.5.yml | 4 ++-- conda/recipes/custreamz/meta.yaml | 4 ++-- conda/recipes/dask-cudf/meta.yaml | 6 +++--- python/custreamz/dev_requirements.txt | 4 ++-- python/dask_cudf/dev_requirements.txt | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index bc82f638171..979db1b5034 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -37,7 +37,7 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/" export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" # Dask & Distributed git tag -export DASK_DISTRIBUTED_GIT_TAG='main' +export DASK_DISTRIBUTED_GIT_TAG='2021.11.2' function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index e2e95c34650..664e774c68a 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -31,7 +31,7 @@ export GIT_DESCRIBE_TAG=`git describe --tags` export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` # Dask & Distributed git tag -export DASK_DISTRIBUTED_GIT_TAG='main' +export DASK_DISTRIBUTED_GIT_TAG='2021.11.2' ################################################################################ # TRAP - Setup trap for removing jitify cache diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 4d106409e1e..62e035a645a 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -41,8 +41,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.09.1 - - distributed>=2021.09.1 + - dask>=2021.09.1,<=2021.11.2 + - distributed>=2021.09.1,<=2021.11.2 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 46785603c0e..5f65294256c 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -41,8 +41,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.09.1 - - distributed>=2021.09.1 + - dask>=2021.09.1,<=2021.11.2 + - distributed>=2021.09.1,<=2021.11.2 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index 635d838640d..b79a3234248 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -41,8 +41,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.09.1 - - distributed>=2021.09.1 + - dask>=2021.09.1,<=2021.11.2 + - distributed>=2021.09.1,<=2021.11.2 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index dc3a17f03ab..7dda6115e81 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -31,8 +31,8 @@ requirements: - python - streamz - cudf {{ version }} - - dask>=2021.09.1 - - distributed>=2021.09.1 + - dask>=2021.09.1,<=2021.11.2 + - distributed>=2021.09.1,<=2021.11.2 - python-confluent-kafka - cudf_kafka {{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 5631e262b87..cb15ac93bea 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -26,13 +26,13 @@ requirements: host: - python - cudf {{ version }} - - dask>=2021.09.1 - - distributed>=2021.09.1 + - dask>=2021.09.1,<=2021.11.2 + - distributed>=2021.09.1,<=2021.11.2 - cudatoolkit {{ cuda_version }} run: - python - cudf {{ version }} - - dask>=2021.09.1 + - dask>=2021.09.1,<=2021.11.2 - distributed>=2021.09.1 - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} diff --git a/python/custreamz/dev_requirements.txt b/python/custreamz/dev_requirements.txt index de39ab4c7c1..f994293a0e3 100644 --- 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.6.4 -dask>=2021.09.1 -distributed>=2021.09.1 +dask>=2021.09.1,<=2021.11.2 +distributed>=2021.09.1,<=2021.11.2 streamz python-confluent-kafka pytest diff --git a/python/dask_cudf/dev_requirements.txt b/python/dask_cudf/dev_requirements.txt index d9dc19bfb7f..fc4fa850a4b 100644 --- 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.09.1 -distributed>=2021.09.1 +dask>=2021.09.1,<=2021.11.2 +distributed>=2021.09.1,<=2021.11.2 fsspec>=0.6.0 numba>=0.53.1 numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 1a9c2ff048a..7e20bd7c513 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -10,8 +10,8 @@ install_requires = [ "cudf", - "dask>=2021.09.1", - "distributed>=2021.09.1", + "dask>=2021.09.1,<=2021.11.2", + "distributed>=2021.09.1,<=2021.11.2", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.4.0dev0", From b1cafad8cfd5f5fffd21051b35361dfd6fa4f078 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 19 Nov 2021 11:38:35 -0600 Subject: [PATCH 2/3] Update conda/recipes/dask-cudf/meta.yaml Co-authored-by: Bradley Dice --- conda/recipes/dask-cudf/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index cb15ac93bea..2e687d13195 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -33,7 +33,7 @@ requirements: - python - cudf {{ version }} - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1 + - distributed>=2021.09.1,<=2021.11.2 - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} test: # [linux64] From e69cdd8ad6c2c15d88b58abeb23eddbbd745f349 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 19 Nov 2021 17:59:45 -0600 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: jakirkham --- conda/environments/cudf_dev_cuda11.0.yml | 4 ++-- conda/environments/cudf_dev_cuda11.2.yml | 4 ++-- conda/environments/cudf_dev_cuda11.5.yml | 4 ++-- conda/recipes/custreamz/meta.yaml | 4 ++-- conda/recipes/dask-cudf/meta.yaml | 8 ++++---- python/custreamz/dev_requirements.txt | 4 ++-- python/dask_cudf/dev_requirements.txt | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 62e035a645a..e2ead779861 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -41,8 +41,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1,<=2021.11.2 + - dask>=2021.11.1,<=2021.11.2 + - distributed>=2021.11.1,<=2021.11.2 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 5f65294256c..6146d84835a 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -41,8 +41,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1,<=2021.11.2 + - dask>=2021.11.1,<=2021.11.2 + - distributed>=2021.11.1,<=2021.11.2 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index b79a3234248..043c81c9e01 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -41,8 +41,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1,<=2021.11.2 + - dask>=2021.11.1,<=2021.11.2 + - distributed>=2021.11.1,<=2021.11.2 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 7dda6115e81..db8af9b0bed 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -31,8 +31,8 @@ requirements: - python - streamz - cudf {{ version }} - - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1,<=2021.11.2 + - dask>=2021.11.1,<=2021.11.2 + - distributed>=2021.11.1,<=2021.11.2 - python-confluent-kafka - cudf_kafka {{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 311e5a07ee2..d90de2d628c 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -27,14 +27,14 @@ requirements: host: - python - cudf {{ version }} - - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1,<=2021.11.2 + - dask>=2021.11.1,<=2021.11.2 + - distributed>=2021.11.1,<=2021.11.2 - cudatoolkit {{ cuda_version }} run: - python - cudf {{ version }} - - dask>=2021.09.1,<=2021.11.2 - - distributed>=2021.09.1,<=2021.11.2 + - dask>=2021.11.1,<=2021.11.2 + - distributed>=2021.11.1,<=2021.11.2 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: # [linux64] diff --git a/python/custreamz/dev_requirements.txt b/python/custreamz/dev_requirements.txt index f994293a0e3..6f1c09947d5 100644 --- 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.6.4 -dask>=2021.09.1,<=2021.11.2 -distributed>=2021.09.1,<=2021.11.2 +dask>=2021.11.1,<=2021.11.2 +distributed>=2021.11.1,<=2021.11.2 streamz python-confluent-kafka pytest diff --git a/python/dask_cudf/dev_requirements.txt b/python/dask_cudf/dev_requirements.txt index fc4fa850a4b..db85515f379 100644 --- 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.09.1,<=2021.11.2 -distributed>=2021.09.1,<=2021.11.2 +dask>=2021.11.1,<=2021.11.2 +distributed>=2021.11.1,<=2021.11.2 fsspec>=0.6.0 numba>=0.53.1 numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 7e20bd7c513..b52c2ea37d6 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -10,8 +10,8 @@ install_requires = [ "cudf", - "dask>=2021.09.1,<=2021.11.2", - "distributed>=2021.09.1,<=2021.11.2", + "dask>=2021.11.1,<=2021.11.2", + "distributed>=2021.11.1,<=2021.11.2", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.4.0dev0",