From 317c56c961e35a2808e37b1a923e680bab0d5f2f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 19:59:08 -0500 Subject: [PATCH] Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version (#430) 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/kvikio/pull/430 --- 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/kvikio/meta.yaml | 2 +- dependencies.yaml | 4 ++-- python/kvikio/pyproject.toml | 5 +++-- python/libkvikio/pyproject.toml | 5 +++-- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 6e2e085874..c6e5314b17 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -29,7 +29,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sphinx - sphinx-click - sphinx_rtd_theme diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 1cbc7c0a80..526e7155ef 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -31,7 +31,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sphinx - sphinx-click - sphinx_rtd_theme diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index 4fcd7aff02..8a9b368aaa 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -29,7 +29,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sphinx - sphinx-click - sphinx_rtd_theme diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index d19547dc34..3a1ed63b16 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -29,7 +29,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sphinx - sphinx-click - sphinx_rtd_theme diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 2f2e308ae7..247be31cf7 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -62,7 +62,7 @@ requirements: - cuda-version ={{ cuda_version }} - nvcomp {{ nvcomp_version }} - rapids-build-backend >=0.3.0,<0.4.0.dev0 - - scikit-build-core >=0.7.0 + - scikit-build-core >=0.10.0 - libkvikio ={{ version }} run: - python diff --git a/dependencies.yaml b/dependencies.yaml index 457185c25a..b3617388ce 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -299,10 +299,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 run: common: - output_types: [conda, requirements, pyproject] diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index fc237b7493..3f68177280 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -5,7 +5,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`. [project] @@ -121,7 +121,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 diff --git a/python/libkvikio/pyproject.toml b/python/libkvikio/pyproject.toml index b40b42dbbd..51306fcf94 100644 --- a/python/libkvikio/pyproject.toml +++ b/python/libkvikio/pyproject.toml @@ -5,7 +5,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`. [project] @@ -34,7 +34,8 @@ Homepage = "https://github.com/rapidsai/kvikio" [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