Skip to content

fix: path_to_module to handle hidden files (e.g. .clang-tidy) correctly #987

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

Merged
merged 5 commits into from
Feb 13, 2025
Merged

fix: path_to_module to handle hidden files (e.g. .clang-tidy) correctly #987

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
f87e9f2
Fix path_to_module to handle hidden files (e.g. .clang-tidy) correctly
tae-jun Feb 6, 2025
a5167a0
Update _pathutil.py
tae-jun Feb 6, 2025
2abddb3
style: pre-commit fixes
pre-commit-ci[bot] Feb 6, 2025
72432fd
fix: different fix and tests
henryiii Feb 12, 2025
5ed68ef
chore: minor touchup
henryiii Feb 12, 2025
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
3 changes: 2 additions & 1 deletion src/scikit_build_core/build/_editable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def libdir_to_installed(libdir: Path) -> dict[str, str]:
Convert a mapping of files to modules to a mapping of modules to installed files.
"""
return {
path_to_module(v.relative_to(libdir)): str(v.relative_to(libdir))
path_to_module(pth): str(pth)
for v in scantree(libdir)
if is_valid_module(pth := v.relative_to(libdir))
}
4 changes: 3 additions & 1 deletion src/scikit_build_core/build/_pathutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ def scantree(path: Path) -> Generator[Path, None, None]:


def path_to_module(path: Path) -> str:
path = path.with_name(path.name.split(".", 1)[0])
name, _, _ = path.name.partition(".")
assert name, f"Empty name should be filtered by is_valid_module first, got {path}"
path = path.with_name(name)
if path.name == "__init__":
path = path.parent
return ".".join(path.parts)
Expand Down
3 changes: 3 additions & 0 deletions tests/packages/navigate_editable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ python_add_library(c_module MODULE src/shared_pkg/c_module.c WITH_SOABI)
set(CMakeVar "Some_value_C")
configure_file(src/shared_pkg/data/generated.txt.in
shared_pkg/data/c_generated.txt)
configure_file(src/shared_pkg/data/generated.txt.in shared_pkg/data/.hidden)

install(
TARGETS c_module
DESTINATION shared_pkg/
COMPONENT PythonModule)
install(FILES ${PROJECT_BINARY_DIR}/shared_pkg/data/c_generated.txt
DESTINATION shared_pkg/data/)
install(FILES ${PROJECT_BINARY_DIR}/shared_pkg/data/.hidden
DESTINATION shared_pkg/data/)
Loading