Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version #1430

Merged
merged 6 commits into from
Aug 12, 2024
+12 −10
Merged

Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version #1430

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba1ae38
Use tool.scikit-build.cmake.version, set scikit-build-core minimum-ve…
jameslamb Aug 7, 2024
9e32ee8
merge 24.10
jameslamb Aug 7, 2024
8f4be5d
Merge branch 'branch-24.10' into scikit-build-core-version
jameslamb Aug 7, 2024
ba7d32e
use build-system.requires
jameslamb Aug 7, 2024
9d7b738
Merge branch 'branch-24.10' into scikit-build-core-version
bdice Aug 9, 2024
527b4d0
Merge branch 'branch-24.10' into scikit-build-core-version
vyasr Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion conda/recipes/cuproj/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion conda/recipes/cuspatial/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions dependencies.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions python/cuproj/pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions python/cuspatial/pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -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