From 0e2270fbb6606ae51a4b826493b5f6ac0682a9ab Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 22:04:22 -0500 Subject: [PATCH] Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version (#280) 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) Approvers: - https://github.com/jakirkham URL: https://github.com/rapidsai/cuvs/pull/280 --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/cuvs/meta.yaml | 2 +- dependencies.yaml | 4 ++-- python/cuvs/pyproject.toml | 5 +++-- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 86b0b80ef..54866d0e5 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -51,7 +51,7 @@ dependencies: - recommonmark - rmm==24.10.*,>=0.0.0a0 - rust -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 2aeff8556..b29fe1b50 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -51,7 +51,7 @@ dependencies: - recommonmark - rmm==24.10.*,>=0.0.0a0 - rust -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index 461de0d30..c6deb93f8 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -47,7 +47,7 @@ dependencies: - recommonmark - rmm==24.10.*,>=0.0.0a0 - rust -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index e1cadb7fe..538fdf08b 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -47,7 +47,7 @@ dependencies: - recommonmark - rmm==24.10.*,>=0.0.0a0 - rust -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/recipes/cuvs/meta.yaml b/conda/recipes/cuvs/meta.yaml index b0f0c3f39..df6cfeec6 100644 --- a/conda/recipes/cuvs/meta.yaml +++ b/conda/recipes/cuvs/meta.yaml @@ -56,7 +56,7 @@ requirements: - python x.x - rmm ={{ minor_version }} - rapids-build-backend>=0.3.0,<0.4.0.dev0 - - scikit-build-core >=0.7.0 + - scikit-build-core >=0.10.0 - setuptools run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/dependencies.yaml b/dependencies.yaml index 9bb8682bf..98c9043aa 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -103,10 +103,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 rapids_build: common: - output_types: [conda, requirements, pyproject] diff --git a/python/cuvs/pyproject.toml b/python/cuvs/pyproject.toml index 6bee50833..cc2aa6a7f 100644 --- a/python/cuvs/pyproject.toml +++ b/python/cuvs/pyproject.toml @@ -16,7 +16,7 @@ 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`. build-backend = "rapids_build_backend.build" @@ -106,7 +106,8 @@ skip = [ [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.reproducible = true wheel.packages = ["cuvs"]