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

Editable installs now respect the value of wheel.install-dir #867

Merged
merged 11 commits into from
Aug 20, 2024

Conversation

psalvaggio
Copy link
Contributor

Attempting to fix: #866

I'm passing down wheel.install-dir to the editable redirect script and appending it to DIR so that rebuilds happen in the correct path. This worked for me in a local testing environment, but I'm not familiar with this codebase, so I don't know if this is an optimal solution.

Copy link

codecov bot commented Aug 20, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 83.98%. Comparing base (8cbd92f) to head (ff924db).
Report is 2 commits behind head on main.

Files Patch % Lines
src/scikit_build_core/build/wheel.py 33.33% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #867      +/-   ##
==========================================
+ Coverage   83.91%   83.98%   +0.07%     
==========================================
  Files          74       74              
  Lines        4363     4372       +9     
==========================================
+ Hits         3661     3672      +11     
+ Misses        702      700       -2     

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

Copy link
Collaborator

@LecrisUT LecrisUT left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for the effort. Just some minor comments. I was looking a bit on if we have a relevant place to slot in the tests for this, but I couldn't find much, so I will help write the tests later.

src/scikit_build_core/resources/_editable_redirect.py Outdated Show resolved Hide resolved
src/scikit_build_core/build/wheel.py Outdated Show resolved Hide resolved
@henryiii
Copy link
Collaborator

henryiii commented Aug 20, 2024

FYI,

can't be None, I think you are introducing a None with the or.

Edit: this was written yesterday, I think you already fixed it.

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
tests/test_editable.py Outdated Show resolved Hide resolved
Also check that CMake is indeed re-run

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
@psalvaggio
Copy link
Contributor Author

Thanks for the help in adding that error check and a test!

@henryiii henryiii merged commit 6b02b1b into scikit-build:main Aug 20, 2024
55 of 59 checks passed
@henryiii
Copy link
Collaborator

Thanks for working on this! After I finish debugging pypa/cibuildwheel#1975, I'll probably try to make a release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Editable install do not use wheel.install-dir when editable.rebuild is trigerred
3 participants