From ba1ae38f374c68d25462af8205f05e1019dc5285 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 6 Aug 2024 20:33:21 -0500 Subject: [PATCH 1/2] Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version --- conda/environments/all_cuda-118_arch-x86_64.yaml | 6 +++--- conda/environments/all_cuda-125_arch-x86_64.yaml | 6 +++--- conda/recipes/cuproj/meta.yaml | 2 +- conda/recipes/cuspatial/meta.yaml | 2 +- dependencies.yaml | 10 +++++----- python/cuproj/pyproject.toml | 5 +++-- python/cuspatial/pyproject.toml | 5 +++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 513f2b28b..a83f1bd04 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -24,8 +24,8 @@ dependencies: - ipython - ipywidgets - libcudf==24.8.*,>=0.0.0a0 -- libcuspatial-tests==24.8.* -- libcuspatial==24.8.* +- libcuspatial-tests==24.8.*,>=0.0.0a0 +- libcuspatial==24.8.*,>=0.0.0a0 - librmm==24.8.*,>=0.0.0a0 - myst-parser - nbsphinx @@ -45,7 +45,7 @@ dependencies: - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-image - shapely - sphinx<6 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 4c245f627..e958ef525 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -27,8 +27,8 @@ dependencies: - ipython - ipywidgets - libcudf==24.8.*,>=0.0.0a0 -- libcuspatial-tests==24.8.* -- libcuspatial==24.8.* +- libcuspatial-tests==24.8.*,>=0.0.0a0 +- libcuspatial==24.8.*,>=0.0.0a0 - librmm==24.8.*,>=0.0.0a0 - myst-parser - nbsphinx @@ -47,7 +47,7 @@ dependencies: - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-image - shapely - sphinx<6 diff --git a/conda/recipes/cuproj/meta.yaml b/conda/recipes/cuproj/meta.yaml index 516ea4a5a..6851ab214 100644 --- a/conda/recipes/cuproj/meta.yaml +++ b/conda/recipes/cuproj/meta.yaml @@ -63,7 +63,7 @@ requirements: - python - rapids-build-backend >=0.3.0,<0.4.0.dev0 - rmm ={{ minor_version }} - - scikit-build-core >=0.7.0 + - scikit-build-core >=0.10.0 - proj - sqlite run: diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml index c06b4fa06..1a4b39752 100644 --- a/conda/recipes/cuspatial/meta.yaml +++ b/conda/recipes/cuspatial/meta.yaml @@ -65,7 +65,7 @@ requirements: - python - rapids-build-backend >=0.3.0,<0.4.0.dev0 - rmm ={{ minor_version }} - - scikit-build-core >=0.7.0 + - scikit-build-core >=0.10.0 run: {% if cuda_major == "11" %} - cudatoolkit diff --git a/dependencies.yaml b/dependencies.yaml index 764c000fd..513f06067 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -252,10 +252,10 @@ dependencies: - &rapids_build_backend 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 cuda_version: specific: - output_types: conda @@ -515,12 +515,12 @@ dependencies: common: - output_types: conda packages: - - libcuspatial==24.8.* - - libcuspatial-tests==24.8.* + - libcuspatial==24.8.*,>=0.0.0a0 + - libcuspatial-tests==24.8.*,>=0.0.0a0 test_cuspatial: common: - output_types: conda packages: - - libcuspatial==24.8.* + - libcuspatial==24.8.*,>=0.0.0a0 - cuspatial==24.8.*,>=0.0.0a0 - cuproj==24.8.*,>=0.0.0a0 diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml index eca654f73..b889c8b8f 100644 --- a/python/cuproj/pyproject.toml +++ b/python/cuproj/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`. [project] @@ -95,7 +95,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 = "0.10" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml index d8461c722..da62a24b4 100644 --- a/python/cuspatial/pyproject.toml +++ b/python/cuspatial/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`. [project] @@ -104,7 +104,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 = "0.10" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true From ba7d32e49daa78e2a8ec5ea5bda760b2da6e0619 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 16:11:34 -0500 Subject: [PATCH 2/2] use build-system.requires --- python/cuproj/pyproject.toml | 2 +- python/cuspatial/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml index 38d643fb6..093c06d56 100644 --- a/python/cuproj/pyproject.toml +++ b/python/cuproj/pyproject.toml @@ -96,7 +96,7 @@ skip = [ build-dir = "build/{wheel_tag}" cmake.build-type = "Release" cmake.version = "CMakeLists.txt" -minimum-version = "0.10" +minimum-version = "build-system.requires" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml index 8105c0fa1..8778080a0 100644 --- a/python/cuspatial/pyproject.toml +++ b/python/cuspatial/pyproject.toml @@ -105,7 +105,7 @@ skip = [ build-dir = "build/{wheel_tag}" cmake.build-type = "Release" cmake.version = "CMakeLists.txt" -minimum-version = "0.10" +minimum-version = "build-system.requires" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true