refactor: minor changes from editable work (#214)

Pulling a bit from #212

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

noxfile.py

@@ -36,7 +36,7 @@ def tests(session: nox.Session) -> None:
     Run the unit and regular tests.
     """
     env = {"PIP_DISABLE_PIP_VERSION_CHECK": "1"}
-    extra = []
+    extra = ["rich"]
     # This will not work if system CMake is too old (<3.15)
     if shutil.which("cmake") is None and shutil.which("cmake3") is None:
         extra.append("cmake")

src/scikit_build_core/_shutil.py

@@ -44,7 +44,7 @@ def _run(
 
         if self.env:
             logger.debug(
-                "RUNENV: {}", " ".join(f"{k}={v}" for k, v in self.env.items())
+                "RUNENV:\n  {}", "\n  ".join(f"{k}={v}" for k, v in self.env.items())
             )
         logger.debug("RUN: {}", " ".join(options))
 

src/scikit_build_core/build/_pathutil.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from collections.abc import Sequence
+from pathlib import Path
+
+from ._file_processor import each_unignored_file
+
+__all__ = ["packages_to_file_mapping"]
+
+
+def __dir__() -> list[str]:
+    return __all__
+
+
+def packages_to_file_mapping(
+    *,
+    packages: Sequence[str],
+    platlib_dir: Path,
+    include: Sequence[str],
+    exclude: Sequence[str],
+) -> dict[str, str]:
+    mapping = {}
+    for package in packages:
+        source_package = Path(package)
+        base_path = source_package.parent
+        for filepath in each_unignored_file(
+            source_package,
+            include=include,
+            exclude=exclude,
+        ):
+            package_dir = platlib_dir / filepath.relative_to(base_path)
+            if not package_dir.is_file():
+                mapping[str(filepath)] = str(package_dir)
+
+    return mapping

src/scikit_build_core/build/wheel.py

@@ -18,8 +18,8 @@
 from ..builder.wheel_tag import WheelTag
 from ..cmake import CMake, CMaker
 from ..settings.skbuild_read_settings import SettingsReader
-from ._file_processor import each_unignored_file
 from ._init import setup_logging
+from ._pathutil import packages_to_file_mapping
 from ._wheelfile import WheelWriter
 
 __all__: list[str] = ["_build_wheel_impl"]
@@ -29,44 +29,24 @@ def __dir__() -> list[str]:
     return __all__
 
 
-def _copy_python_packages_to_wheel(
-    *,
-    packages: Sequence[str] | None,
-    name: str,
-    platlib_dir: Path,
-    include: Sequence[str],
-    exclude: Sequence[str],
-) -> dict[str, str]:
-    mapping = {}
-    if packages is None:
-        # Auto package discovery
-        packages = []
-        for base_path in (Path("src"), Path(".")):
-            path = base_path / name
-            if path.is_dir() and (
-                (path / "__init__.py").is_file() or (path / "__init__.pyi").is_file()
-            ):
-                logger.info("Discovered Python package at {}", path)
-                packages += [str(path)]
-                break
-        else:
-            logger.debug("Didn't find a Python package for {}", name)
-
-    for package in packages:
-        source_package = Path(package)
-        base_path = source_package.parent
-        for filepath in each_unignored_file(
-            source_package,
-            include=include,
-            exclude=exclude,
+def _get_packages(*, packages: Sequence[str] | None, name: str) -> list[str]:
+    if packages is not None:
+        return list(packages)
+
+    # Auto package discovery
+    packages = []
+    for base_path in (Path("src"), Path(".")):
+        path = base_path / name
+        if path.is_dir() and (
+            (path / "__init__.py").is_file() or (path / "__init__.pyi").is_file()
         ):
-            package_dir = platlib_dir / filepath.relative_to(base_path)
-            if not package_dir.is_file():
-                package_dir.parent.mkdir(exist_ok=True, parents=True)
-                shutil.copyfile(filepath, package_dir)
-                mapping[str(filepath)] = str(package_dir)
+            logger.info("Discovered Python package at {}", path)
+            packages += [str(path)]
+            break
+    else:
+        logger.debug("Didn't find a Python package for {}", name)
 
-    return mapping
+    return packages
 
 
 @dataclasses.dataclass
@@ -203,14 +183,21 @@ def _build_wheel_impl(
         builder.install(install_dir)
 
         rich_print("[green]***[/green] [bold]Making wheel...")
-        mapping = _copy_python_packages_to_wheel(
+        packages = _get_packages(
             packages=settings.wheel.packages,
             name=normalized_name,
+        )
+        mapping = packages_to_file_mapping(
+            packages=packages,
             platlib_dir=wheel_dirs["platlib"],
             include=settings.sdist.include,
             exclude=settings.sdist.exclude,
         )
 
+        for filepath, package_dir in mapping.items():
+            Path(package_dir).parent.mkdir(exist_ok=True, parents=True)
+            shutil.copyfile(filepath, package_dir)
+
         for item in wheel_dirs["scripts"].iterdir():
             with item.open("rb") as f:
                 content = f.read(len(b"#!python"))