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.

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

feat: Rework CMake search path settings #880

Merged
merged 3 commits into from
Feb 25, 2025

Conversation

LecrisUT
Copy link
Collaborator

@LecrisUT LecrisUT commented Aug 29, 2024

  • Gate the install path's site-packages by an option
  • Add logic for entry_points(group="cmake.root"):
  • Documentation
    • Add a new page on all the search logics
    • Encourage the usage of cmake.root over cmake.prefix
  • Tests

Closes #831
Closes #885
Relates to #860 (still keeping it open because it doesn't address the specific issue)

@LecrisUT LecrisUT force-pushed the feat/ignore-prefix branch 2 times, most recently from 6b44e12 to a178c3b Compare August 29, 2024 13:01
@LecrisUT LecrisUT changed the title feat: Rework CMake prefix calculations feat: Rework CMake search path settings Aug 29, 2024
@LecrisUT LecrisUT force-pushed the feat/ignore-prefix branch 2 times, most recently from 81742a7 to c9454cd Compare August 29, 2024 13:20
Copy link

codecov bot commented Aug 29, 2024

Codecov Report

Attention: Patch coverage is 67.14286% with 23 lines in your changes missing coverage. Please review.

Project coverage is 83.62%. Comparing base (1124da7) to head (836c51e).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
src/scikit_build_core/builder/builder.py 53.65% 19 Missing ⚠️
src/scikit_build_core/cmake.py 33.33% 4 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #880      +/-   ##
==========================================
- Coverage   83.90%   83.62%   -0.29%     
==========================================
  Files          74       75       +1     
  Lines        4387     4451      +64     
==========================================
+ Hits         3681     3722      +41     
- Misses        706      729      +23     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@LecrisUT LecrisUT marked this pull request as ready for review August 29, 2024 14:57
@LecrisUT LecrisUT requested a review from henryiii August 29, 2024 14:57
This variable is populated from the entry-point `cmake.module` and the option
`search.modules` similar to [`CMAKE_PREFIX_PATH`] section.

[`CMAKE_PREFIX_PATH`]: #cmake-prefix-path
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This link does indeed work, but the CI is reporting as not working 🤷

@henryiii henryiii added this to the v0.11.0 milestone Aug 29, 2024
@LecrisUT LecrisUT force-pushed the feat/ignore-prefix branch 2 times, most recently from 5770c6a to 732eab5 Compare September 3, 2024 09:38
@LecrisUT LecrisUT force-pushed the feat/ignore-prefix branch 2 times, most recently from 659e0cb to 836c51e Compare September 3, 2024 10:09
@henryiii
Copy link
Collaborator

henryiii commented Sep 3, 2024

(Sorry I'm a bit slow reviewing, classes start this week and I'm teaching again)

henryiii added a commit that referenced this pull request Sep 10, 2024
Pulling out this fix from
#880 for inclusion
in a patch release.

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: Cristian Le <[email protected]>
@LecrisUT LecrisUT force-pushed the feat/ignore-prefix branch 4 times, most recently from 57514c7 to a6bccfa Compare September 24, 2024 13:05
@LecrisUT LecrisUT force-pushed the feat/ignore-prefix branch 3 times, most recently from 65dd0d7 to d5a437e Compare February 21, 2025 20:17
@henryiii
Copy link
Collaborator

Conflict, and were you planning any extra tests?

LecrisUT and others added 2 commits February 24, 2025 20:16
@LecrisUT
Copy link
Collaborator Author

LecrisUT commented Feb 24, 2025

Conflict, and were you planning any extra tests?

Yeah, forgot about that one. Added the tests for cmake.root, but haven't thought of how to add one for search.site-packages

Signed-off-by: Cristian Le <[email protected]>
Signed-off-by: Cristian Le <[email protected]>
@henryiii henryiii merged commit e9ab153 into scikit-build:main Feb 25, 2025
60 checks passed
@LecrisUT LecrisUT deleted the feat/ignore-prefix branch February 27, 2025 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants