From 897f0b6af101fc8bed24ab4c636ca06d297496d3 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 26 Jan 2024 11:09:03 -0800 Subject: [PATCH 1/2] Allow using pandas 2 (#1308) dask-cuda uses pandas for some tests, but the main reason for the pinning is that it is inherited from RAPIDS libraries (mainly cudf) that do not yet support pandas 2.0 and are the primary use case for dask-cuda. However, there is no reason dask-cuda cannot be used in other contexts, so relaxing this constraint makes sense. Resolves #1306 Authors: - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - GALI PREM SAGAR (https://github.com/galipremsagar) - Lawrence Mitchell (https://github.com/wence-) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/dask-cuda/pull/1308 --- conda/environments/all_cuda-114_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-120_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/all_cuda-114_arch-x86_64.yaml b/conda/environments/all_cuda-114_arch-x86_64.yaml index ab0c276e..5c1c20fd 100644 --- a/conda/environments/all_cuda-114_arch-x86_64.yaml +++ b/conda/environments/all_cuda-114_arch-x86_64.yaml @@ -18,7 +18,7 @@ dependencies: - numba>=0.57 - numpy>=1.21 - numpydoc>=1.1.0 -- pandas>=1.3,<1.6.0.dev0 +- pandas>=1.3 - pre-commit - pynvml>=11.0.0,<11.5 - pytest diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 93ca6999..11a926d0 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -18,7 +18,7 @@ dependencies: - numba>=0.57 - numpy>=1.21 - numpydoc>=1.1.0 -- pandas>=1.3,<1.6.0.dev0 +- pandas>=1.3 - pre-commit - pynvml>=11.0.0,<11.5 - pytest diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index bddc705c..e468d2f0 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -19,7 +19,7 @@ dependencies: - numba>=0.57 - numpy>=1.21 - numpydoc>=1.1.0 -- pandas>=1.3,<1.6.0.dev0 +- pandas>=1.3 - pre-commit - pynvml>=11.0.0,<11.5 - pytest diff --git a/dependencies.yaml b/dependencies.yaml index 671f43c4..89e5fa3e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -146,7 +146,7 @@ dependencies: - click >=8.1 - numba>=0.57 - numpy>=1.21 - - pandas>=1.3,<1.6.0.dev0 + - pandas>=1.3 - pynvml>=11.0.0,<11.5 - rapids-dask-dependency==24.4.* - zict>=2.0.0 diff --git a/pyproject.toml b/pyproject.toml index a6df9b9b..b332307f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "click >=8.1", "numba>=0.57", "numpy>=1.21", - "pandas>=1.3,<1.6.0.dev0", + "pandas>=1.3", "pynvml>=11.0.0,<11.5", "rapids-dask-dependency==24.4.*", "zict>=2.0.0", From 2adc0599c9160eb42f2196d74c6400c57e9238cc Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Jan 2024 07:34:11 -0600 Subject: [PATCH 2/2] handle more RAPIDS version formats in update-version.sh (#1307) Contributes to https://github.com/rapidsai/build-planning/issues/13. Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`. This project doesn't appear to have any of those right now, but might in the future. ### How I tested this The portability of this updated `sed` command was tested here: https://github.com/rapidsai/cudf/pull/14825#issuecomment-1904735849. In this repo, I ran the following: ```shell ./ci/release/update-version.sh '23.10.00' git diff ./ci/release/update-version.sh '24.04.00' git diff ``` Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Peter Andreas Entschev (https://github.com/pentschev) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/dask-cuda/pull/1307 --- ci/release/update-version.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index b2fc490f..9f40318b 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -35,13 +35,21 @@ function sed_runner() { # Centralized version file update echo "${NEXT_FULL_TAG}" | tr -d '"' > VERSION -# Bump cudf and dask-cudf testing dependencies -sed_runner "s/cudf==.*/cudf==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml -sed_runner "s/dask-cudf==.*/dask-cudf==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml -sed_runner "s/kvikio==.*/kvikio==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml +# Bump testing dependencies sed_runner "s/ucx-py==.*/ucx-py==${NEXT_UCXPY_VERSION}.*/g" dependencies.yaml sed_runner "s/ucxx==.*/ucxx==${NEXT_UCXPY_VERSION}.*/g" dependencies.yaml -sed_runner "s/rapids-dask-dependency==.*/rapids-dask-dependency==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml + +DEPENDENCIES=( + cudf + dask-cudf + kvikio + rapids-dask-dependency +) +for FILE in dependencies.yaml conda/environments/*.yaml; do + for DEP in "${DEPENDENCIES[@]}"; do + sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}" + done +done # CI files for FILE in .github/workflows/*.yaml; do