From 274492d279d5e427950b85ea3e3e22ab77863b69 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 6 Aug 2024 19:55:29 -0500 Subject: [PATCH 1/3] Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/pylibwholegraph/conda_build_config.yaml | 2 +- dependencies.yaml | 4 ++-- python/pylibwholegraph/pyproject.toml | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9bb060599..30b9ad9e7 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -43,7 +43,7 @@ dependencies: - pytorch=2.0.0 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - recommonmark -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sphinx-copybutton - sphinx-markdown-tables - 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 3c8750697..a503d3d0e 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -42,7 +42,7 @@ dependencies: - python>=3.9,<3.12 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - recommonmark -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sphinx-copybutton - sphinx-markdown-tables - sphinx<6 diff --git a/conda/recipes/pylibwholegraph/conda_build_config.yaml b/conda/recipes/pylibwholegraph/conda_build_config.yaml index 46f3a251b..b5e529cbc 100644 --- a/conda/recipes/pylibwholegraph/conda_build_config.yaml +++ b/conda/recipes/pylibwholegraph/conda_build_config.yaml @@ -14,7 +14,7 @@ cmake_version: - ">=3.26.4,!=3.30.0" scikit_build_core_version: - - ">=0.7.0" + - ">=0.10.0" c_stdlib: - sysroot diff --git a/dependencies.yaml b/dependencies.yaml index 29135fa7f..a4c31e239 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -336,10 +336,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 python_build_wheel: common: - output_types: [pyproject] diff --git a/python/pylibwholegraph/pyproject.toml b/python/pylibwholegraph/pyproject.toml index 19b48cb9f..639279436 100644 --- a/python/pylibwholegraph/pyproject.toml +++ b/python/pylibwholegraph/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] @@ -52,7 +52,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 = "0.10" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true From 798c98323198747324bd8e74f40c137659b21719 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 6 Aug 2024 21:37:35 -0500 Subject: [PATCH 2/3] change target branch From 22edd301033bb0e178b8ba32fb00955dec5fe763 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 16:15:43 -0500 Subject: [PATCH 3/3] use build-system.requires --- python/pylibwholegraph/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pylibwholegraph/pyproject.toml b/python/pylibwholegraph/pyproject.toml index 639279436..20b0b3aa9 100644 --- a/python/pylibwholegraph/pyproject.toml +++ b/python/pylibwholegraph/pyproject.toml @@ -53,7 +53,7 @@ requires = [ 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