test: nicer exit, minor refactors (#213)

Pulled from #212.

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

Author: henryiii

src/scikit_build_core/build/_wheelfile.py

@@ -93,6 +93,10 @@ def basename(self) -> str:
     def wheelpath(self) -> Path:
         return self.folder / f"{self.basename}.whl"
 
+    @property
+    def dist_info(self) -> str:
+        return f"{self.name_ver}.dist-info"
+
     @staticmethod
     def timestamp(mtime: float | None = None) -> tuple[int, int, int, int, int, int]:
         timestamp = int(os.environ.get("SOURCE_DATE_EPOCH", mtime or time.time()))
@@ -145,7 +149,7 @@ def build(self, wheel_dirs: dict[str, Path]) -> None:
 
         dist_info_contents = self.dist_info_contents()
         for key, data in dist_info_contents.items():
-            self.writestr(f"{self.name_ver}.dist-info/{key}", data)
+            self.writestr(f"{self.dist_info}/{key}", data)
 
     def write(self, filename: str, arcname: str | None = None) -> None:
         """Write a file to the archive."""
@@ -179,7 +183,7 @@ def __enter__(self) -> Self:
 
     def __exit__(self, *args: object) -> None:
         assert self.zipfile is not None
-        record = f"{self.name_ver}.dist-info/RECORD"
+        record = f"{self.dist_info}/RECORD"
         data = io.StringIO()
         writer = csv.writer(data, delimiter=",", quotechar='"', lineterminator="\n")
         for member in self.zipfile.infolist():

src/scikit_build_core/build/wheel.py

@@ -77,8 +77,8 @@ class WheelImplReturn:
 
 def _build_wheel_impl(
     wheel_directory: str | None,
-    config_settings: dict[str, list[str] | str] | None = None,
-    metadata_directory: str | None = None,
+    config_settings: dict[str, list[str] | str] | None,
+    metadata_directory: str | None,
 ) -> WheelImplReturn:
     """
     Build a wheel or just prepare metadata (if wheel dir is None).
@@ -98,6 +98,8 @@ def _build_wheel_impl(
         msg = "project.version is not statically specified, must be present currently"
         raise AssertionError(msg)
 
+    normalized_name = metadata.name.replace("-", "_").replace(".", "_")
+
     cmake = CMake.default_search(
         minimum_version=Version(settings.cmake.minimum_version)
     )
@@ -203,7 +205,7 @@ def _build_wheel_impl(
         rich_print("[green]***[/green] [bold]Making wheel...")
         mapping = _copy_python_packages_to_wheel(
             packages=settings.wheel.packages,
-            name=metadata.name.replace("-", "_").replace(".", "_"),
+            name=normalized_name,
             platlib_dir=wheel_dirs["platlib"],
             include=settings.sdist.include,
             exclude=settings.sdist.exclude,

tests/conftest.py

@@ -108,6 +108,7 @@ def run(self, *args: str, capture: Literal[False] = ...) -> None:
         ...
 
     def run(self, *args: str, capture: bool = False) -> str | None:
+        __tracebackhide__ = True
         env = os.environ.copy()
         env["PATH"] = f"{self.executable.parent}{os.pathsep}{env['PATH']}"
         env["VIRTUAL_ENV"] = str(self.env_dir)
@@ -116,20 +117,31 @@ def run(self, *args: str, capture: bool = False) -> str | None:
             env["PIP_NO_INDEX"] = "ON"
             env["PIP_FIND_LINKS"] = str(self.wheelhouse)
 
+        str_args = [os.fspath(a) for a in args]
+
         if capture:
-            return subprocess.run(
-                [os.fspath(a) for a in args],
-                check=True,
+            result = subprocess.run(
+                str_args,
+                check=False,
                 capture_output=True,
                 text=True,
                 env=env,
-            ).stdout.strip()
-
-        subprocess.run(
-            [os.fspath(a) for a in args],
-            check=True,
+            )
+            if result.returncode != 0:
+                print(result.stdout, file=sys.stdout)
+                print(result.stderr, file=sys.stderr)
+                print("FAILED RUN:", *str_args, file=sys.stderr)
+                raise SystemExit(result.returncode)
+            return result.stdout.strip()
+
+        result_bytes = subprocess.run(
+            str_args,
+            check=False,
             env=env,
         )
+        if result_bytes.returncode != 0:
+            print("FAILED RUN:", *str_args, file=sys.stderr)
+            raise SystemExit(result_bytes.returncode)
         return None
 
     def execute(self, command: str) -> str: