From 4de968e2b1281c038bec7d5edb784668371dbca7 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 27 Sep 2021 12:15:56 -0500 Subject: [PATCH] Unpin `dask` and `distributed` in CI (#9307) This PR unpins `dask` and `distributed` in CI. Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Charles Blackmon-Luca (https://github.com/charlesbluca) - AJ Schmidt (https://github.com/ajschmidt8) - https://github.com/jakirkham URL: https://github.com/rapidsai/cudf/pull/9307 --- ci/benchmark/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/environments/cudf_dev_cuda11.0.yml | 8 ++++---- conda/environments/cudf_dev_cuda11.2.yml | 8 ++++---- 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 | 8 ++++---- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index c2544ff7ffe..bc82f638171 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='2021.09.1' +export DASK_DISTRIBUTED_GIT_TAG='main' function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 7c5b9d836dd..631801bc8d4 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='2021.09.1' +export DASK_DISTRIBUTED_GIT_TAG='main' ################################################################################ # 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 d5251b18582..f4698746465 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -39,8 +39,8 @@ dependencies: - mypy=0.782 - typing_extensions - pre_commit - - dask=2021.09.1 - - distributed=2021.09.1 + - dask>=2021.09.1 + - distributed>=2021.09.1 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 @@ -58,7 +58,7 @@ dependencies: - transformers - pydata-sphinx-theme - pip: - - git+https://github.com/dask/dask.git@2021.09.1 - - git+https://github.com/dask/distributed.git@2021.09.1 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main - git+https://github.com/python-streamz/streamz.git@master - pyorc diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 7ab2cd60ce3..88b703fa23d 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -39,8 +39,8 @@ dependencies: - mypy=0.782 - typing_extensions - pre_commit - - dask=2021.09.1 - - distributed=2021.09.1 + - dask>=2021.09.1 + - distributed>=2021.09.1 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 @@ -58,7 +58,7 @@ dependencies: - transformers - pydata-sphinx-theme - pip: - - git+https://github.com/dask/dask.git@2021.09.1 - - git+https://github.com/dask/distributed.git@2021.09.1 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main - git+https://github.com/python-streamz/streamz.git@master - pyorc diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index db8aa8e6c85..dc3a17f03ab 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 + - distributed>=2021.09.1 - python-confluent-kafka - cudf_kafka {{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 45d96a2de85..ed3f8fa7139 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 + - distributed>=2021.09.1 run: - python - cudf {{ version }} - - dask=2021.09.1 - - distributed=2021.09.1 + - dask>=2021.09.1 + - distributed>=2021.09.1 test: # [linux64] requires: # [linux64] diff --git a/python/custreamz/dev_requirements.txt b/python/custreamz/dev_requirements.txt index 2f2a45dbe05..de39ab4c7c1 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 +distributed>=2021.09.1 streamz python-confluent-kafka pytest diff --git a/python/dask_cudf/dev_requirements.txt b/python/dask_cudf/dev_requirements.txt index 7d41184feae..d9dc19bfb7f 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 +distributed>=2021.09.1 fsspec>=0.6.0 numba>=0.53.1 numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 515469f8b6c..1a9c2ff048a 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", + "distributed>=2021.09.1", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.4.0dev0", @@ -23,8 +23,8 @@ "pandas>=1.0,<1.4.0dev0", "pytest", "numba>=0.53.1", - "dask==2021.09.1", - "distributed==2021.09.1", + "dask>=2021.09.1", + "distributed>=2021.09.1", ] }