Merge remote-tracking branch 'upstream/branch-24.04' into test-cuda-12.2

rapidsai · Feb 9, 2024 · 8fc3c0b · 8fc3c0b
2 parents a33819e + 2adc059
commit 8fc3c0b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git 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

diff --git 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
@@ -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-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_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
@@ -150,7 +150,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
@@ -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",