Merge pull request rapidsai#5192 from rapidsai/branch-23.02

Forward-merge branch-23.02 to branch-23.04
AyodeAwe · Feb 2, 2023 · cd84dcc · cd84dcc
2 parents 20a3ae6 + 56994ed
commit cd84dcc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2019-2022, NVIDIA CORPORATION.
+# Copyright (c) 2019-2023, NVIDIA CORPORATION.
 ########################
 # cuML Version Updater #
 ########################
@@ -67,3 +67,10 @@ sed_runner "s/extra-repo-sha: branch-.*/extra-repo-sha: branch-${NEXT_SHORT_TAG}
 
 # Wheel builds install dask-cuda from source, update its branch
 sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" .github/workflows/*.yaml
+
+# Need to distutils-normalize the original version
+NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
+
+# Wheel builds install intra-RAPIDS dependencies from same release
+sed_runner "s/{cuda_suffix}==.*\",/{cuda_suffix}==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/setup.py
+sed_runner "s/{cuda_suffix}==.*\",/{cuda_suffix}==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/_custom_build/backend.py
diff --git a/python/_custom_build/backend.py b/python/_custom_build/backend.py
@@ -19,10 +19,10 @@ def replace_requirements(func):
     @wraps(func)
     def wrapper(config_settings=None):
         orig_list = getattr(_orig, func.__name__)(config_settings)
-        suffix = os.getenv('RAPIDS_PY_WHEEL_CUDA_SUFFIX', default='')
+        cuda_suffix = os.getenv('RAPIDS_PY_WHEEL_CUDA_SUFFIX', default='')
         append_list = [
-            f"rmm{suffix}",
-            f"pylibraft{suffix}",
+            f"rmm{cuda_suffix}==23.2.*",
+            f"pylibraft{cuda_suffix}==23.2.*",
         ]
         return orig_list + append_list
 

diff --git a/python/setup.py b/python/setup.py
@@ -147,10 +147,10 @@ def get_versions():
         "seaborn",
         "treelite==3.1.0",
         "treelite_runtime==3.1.0",
-        f"cudf{cuda_suffix}",
-        f"dask-cudf{cuda_suffix}",
-        f"pylibraft{cuda_suffix}",
-        f"raft-dask{cuda_suffix}",
+        f"cudf{cuda_suffix}==23.2.*",
+        f"dask-cudf{cuda_suffix}==23.2.*",
+        f"pylibraft{cuda_suffix}==23.2.*",
+        f"raft-dask{cuda_suffix}==23.2.*",
       ],
       extras_require={
           "test": [