Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REVIEW] Unpin dask and distributed for development #12710

Merged
merged 3 commits into from
Feb 10, 2023
Merged

[REVIEW] Unpin dask and distributed for development #12710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea410e5
Unpin dask and distributed for development
galipremsagar Feb 6, 2023
5a29b49
Merge branch 'branch-23.04' into unpin_dask
galipremsagar Feb 9, 2023
e340141
Merge branch 'branch-23.04' into unpin_dask
pentschev Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/benchmark/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/"
export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache"

# Dask & Distributed option to install main(nightly) or `conda-forge` packages.
export INSTALL_DASK_MAIN=0
export INSTALL_DASK_MAIN=1

# Dask version to install when `INSTALL_DASK_MAIN=0`
export DASK_STABLE_VERSION="2023.1.1"
Expand Down
2 changes: 1 addition & 1 deletion ci/cpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export CONDA_BLD_DIR="$WORKSPACE/.conda-bld"

# Whether to keep `dask/label/dev` channel in the env. If INSTALL_DASK_MAIN=0,
# `dask/label/dev` channel is removed.
export INSTALL_DASK_MAIN=0
export INSTALL_DASK_MAIN=1

# Switch to project root; also root of repo checkout
cd "$WORKSPACE"
Expand Down
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
unset GIT_DESCRIBE_TAG

# Dask & Distributed option to install main(nightly) or `conda-forge` packages.
export INSTALL_DASK_MAIN=0
export INSTALL_DASK_MAIN=1

# Dask version to install when `INSTALL_DASK_MAIN=0`
export DASK_STABLE_VERSION="2023.1.1"
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ dependencies:
- cxx-compiler
- cython>=0.29,<0.30
- dask-cuda=23.04.*
- dask==2023.1.1
- distributed==2023.1.1
- dask>=2023.1.1
- distributed>=2023.1.1
- dlpack>=0.5,<0.6.0a0
- doxygen=1.8.20
- fastavro>=0.22.9
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/custreamz/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ requirements:
- python
- streamz
- cudf ={{ version }}
- dask ==2023.1.1
- distributed ==2023.1.1
- dask >=2023.1.1
- distributed >=2023.1.1
- python-confluent-kafka >=1.7.0,<1.8.0a0
- cudf_kafka ={{ version }}

Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/dask-cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ requirements:
host:
- python
- cudf ={{ version }}
- dask ==2023.1.1
- distributed ==2023.1.1
- dask >=2023.1.1
- distributed >=2023.1.1
- cudatoolkit ={{ cuda_version }}
run:
- python
- cudf ={{ version }}
- dask ==2023.1.1
- distributed ==2023.1.1
- dask >=2023.1.1
- distributed >=2023.1.1
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}

test:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/dask-cudf/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ "${ARCH}" = "aarch64" ]; then
fi

# Dask & Distributed option to install main(nightly) or `conda-forge` packages.
export INSTALL_DASK_MAIN=0
export INSTALL_DASK_MAIN=1

# Dask version to install when `INSTALL_DASK_MAIN=0`
export DASK_STABLE_VERSION="2023.1.1"
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ dependencies:
- output_types: [conda, requirements]
packages:
- cachetools
- dask==2023.1.1
- distributed==2023.1.1
- dask>=2023.1.1
- distributed>=2023.1.1
- fsspec>=0.6.0
- numba>=0.56.2
- numpy
Expand Down
4 changes: 2 additions & 2 deletions python/dask_cudf/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
cuda_suffix = os.getenv("RAPIDS_PY_WHEEL_CUDA_SUFFIX", default="")

install_requires = [
"dask==2023.1.1",
"distributed==2023.1.1",
"dask>=2023.1.1",
"distributed>=2023.1.1",
"fsspec>=0.6.0",
"numpy",
"pandas>=1.0,<1.6.0dev0",
Expand Down