Skip to content

Commit

Permalink
Merge pull request #1108 from rapidsai/branch-23.02
Browse files Browse the repository at this point in the history
Forward-merge branch-23.02 to branch-23.04
  • Loading branch information
GPUtester authored Feb 6, 2023
2 parents d0ca59d + 80d7296 commit 7c5d0b9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ export GPUCI_CONDA_RETRY_SLEEP=30

# 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=1
export INSTALL_DASK_MAIN=0

# Dask version to install when `INSTALL_DASK_MAIN=0`
export DASK_STABLE_VERSION="2022.12.0"
export DASK_STABLE_VERSION="2023.1.1"

# Switch to project root; also root of repo checkout
cd "$WORKSPACE"
Expand Down
4 changes: 2 additions & 2 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ export NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=1

# Install dask and distributed from main branch. Usually needed during
# development time and disabled before a new dask-cuda release.
export INSTALL_DASK_MAIN=1
export INSTALL_DASK_MAIN=0

# Dask version to install when `INSTALL_DASK_MAIN=0`
export DASK_STABLE_VERSION="2022.12.0"
export DASK_STABLE_VERSION="2023.1.1"

# Temporary workaround for Jupyter errors.
# See https://github.com/rapidsai/dask-cuda/issues/1040
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ dependencies:
common:
- output_types: [conda, requirements]
packages:
- dask>=2022.12.0
- distributed>=2022.12.0
- dask==2023.1.1
- distributed==2023.1.1
- numba>=0.54
- numpy>=1.18.0
- pandas>=1.0
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ authors = [
license = { text = "Apache-2.0" }
requires-python = ">=3.8"
dependencies = [
"dask >=2022.12.0",
"distributed >=2022.12.0",
"dask ==2023.1.1",
"distributed ==2023.1.1",
"pynvml >=11.0.0",
"numpy >=1.18.0",
"numba >=0.54",
Expand Down

0 comments on commit 7c5d0b9

Please sign in to comment.