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 #6012

Merged
merged 5 commits into from
Aug 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05ae627
Use tool.scikit-build.cmake.version, set scikit-build-core minimum-ve…
jameslamb Aug 7, 2024
ec2ad51
merge 24.10
jameslamb Aug 7, 2024
36b4ddb
Merge branch 'branch-24.10' of github.com:rapidsai/cuml into scikit-b…
jameslamb Aug 7, 2024
bdfbff7
use build-system.requires
jameslamb Aug 7, 2024
5ea986b
Merge branch 'branch-24.10' into scikit-build-core-version
dantegd Aug 9, 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
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencies:
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn==1.5
- scipy>=1.8.0
- seaborn
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies:
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn==1.5
- scipy>=1.8.0
- seaborn
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml-cpu/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requirements:
- ninja
host:
- python x.x
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- cython>=3.0.0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
run:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ requirements:
- pylibraft ={{ minor_version }}
- python x.x
- raft-dask ={{ minor_version }}
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- treelite {{ treelite_version }}
- rapids-build-backend>=0.3.0,<0.4.0.dev0
run:
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,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
checks:
common:
- output_types: [conda, requirements]
Expand Down
5 changes: 3 additions & 2 deletions python/cuml/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

[tool.pytest.ini_options]
Expand Down Expand Up @@ -167,7 +167,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
Expand Down
Loading