From 0def703b4972d33359ec5cedbf6229f3256f686d Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 9 Aug 2024 02:21:03 -0500
Subject: [PATCH] Use tool.scikit-build.cmake.version, set scikit-build-core
 minimum-version (#6012)

Contributes to https://github.com/rapidsai/build-planning/issues/58.

`scikit-build-core==0.10.0` was released today (https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.0), and wheel-building configurations across RAPIDS are incompatible with it.

This proposes upgrading to that version and fixing configuration here in a way that:

* is compatible with that new `scikit-build-core` version
* takes advantage of the forward-compatibility mechanism (`minimum-version`) that `scikit-build-core` provides, to reduce the risk of needing to do this again in the future

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Dante Gama Dessavre (https://github.com/dantegd)

Approvers:
  - https://github.com/jakirkham

URL: https://github.com/rapidsai/cuml/pull/6012
---
 conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +-
 conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +-
 conda/recipes/cuml-cpu/meta.yaml                 | 2 +-
 conda/recipes/cuml/meta.yaml                     | 2 +-
 dependencies.yaml                                | 4 ++--
 python/cuml/pyproject.toml                       | 5 +++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 6b21da6772..e17902c787 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -63,7 +63,7 @@ dependencies:
 - rapids-dask-dependency==24.10.*,>=0.0.0a0
 - recommonmark
 - rmm==24.10.*,>=0.0.0a0
-- scikit-build-core>=0.7.0
+- scikit-build-core>=0.10.0
 - scikit-learn==1.5
 - scipy>=1.8.0
 - seaborn
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
index a21c795721..b4d3324501 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -59,7 +59,7 @@ dependencies:
 - rapids-dask-dependency==24.10.*,>=0.0.0a0
 - recommonmark
 - rmm==24.10.*,>=0.0.0a0
-- scikit-build-core>=0.7.0
+- scikit-build-core>=0.10.0
 - scikit-learn==1.5
 - scipy>=1.8.0
 - seaborn
diff --git a/conda/recipes/cuml-cpu/meta.yaml b/conda/recipes/cuml-cpu/meta.yaml
index ec5fa195e2..e3813db79a 100644
--- a/conda/recipes/cuml-cpu/meta.yaml
+++ b/conda/recipes/cuml-cpu/meta.yaml
@@ -26,7 +26,7 @@ requirements:
     - ninja
   host:
     - python x.x
-    - scikit-build-core >=0.7.0
+    - scikit-build-core >=0.10.0
     - cython>=3.0.0
     - rapids-build-backend>=0.3.0,<0.4.0.dev0
   run:
diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml
index 5fd0e58b40..bca0b0378c 100644
--- a/conda/recipes/cuml/meta.yaml
+++ b/conda/recipes/cuml/meta.yaml
@@ -69,7 +69,7 @@ requirements:
     - pylibraft ={{ minor_version }}
     - python x.x
     - raft-dask ={{ minor_version }}
-    - scikit-build-core >=0.7.0
+    - scikit-build-core >=0.10.0
     - treelite {{ treelite_version }}
     - rapids-build-backend>=0.3.0,<0.4.0.dev0
   run:
diff --git a/dependencies.yaml b/dependencies.yaml
index 11687b35a8..2146264618 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -111,10 +111,10 @@ dependencies:
           - rapids-build-backend>=0.3.0,<0.4.0.dev0
       - output_types: [conda]
         packages:
-          - scikit-build-core>=0.7.0
+          - scikit-build-core>=0.10.0
       - output_types: [requirements, pyproject]
         packages:
-          - scikit-build-core[pyproject]>=0.7.0
+          - scikit-build-core[pyproject]>=0.10.0
   checks:
     common:
       - output_types: [conda, requirements]
diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml
index b3bf41f42b..2073a5060e 100644
--- a/python/cuml/pyproject.toml
+++ b/python/cuml/pyproject.toml
@@ -16,7 +16,7 @@
 build-backend = "rapids_build_backend.build"
 requires = [
     "rapids-build-backend>=0.3.0,<0.4.0.dev0",
-    "scikit-build-core[pyproject]>=0.7.0",
+    "scikit-build-core[pyproject]>=0.10.0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [tool.pytest.ini_options]
@@ -167,7 +167,8 @@ requires = [
 [tool.scikit-build]
 build-dir = "build/{wheel_tag}"
 cmake.build-type = "Release"
-cmake.minimum-version = "3.26.4"
+cmake.version = "CMakeLists.txt"
+minimum-version = "build-system.requires"
 ninja.make-fallback = true
 sdist.exclude = ["*tests*"]
 sdist.reproducible = true