Overwrite original wheel in place

Author: oscarbenjamin

bin/cibw_repair_wheel_licenses.py

@@ -13,31 +13,23 @@ def main(*args: str):
     Update license information in wheels after running auditwheel etc.
 
     Usage:
-       cibw_repair_wheel_licenses.py <dest_dir> <wheel_file> \
+       cibw_repair_wheel_licenses.py <wheel_file> \
            --license MIT --license-file licenses/license_foo_MIT.txt \
            --license BSD-3-Clause --license-file licenses/license_bar_BSD-3-Clause.txt \
            ...
 
     CWD should be at project root (containing pyproject.toml) and license-file
     paths must be relative.
 
-    The wheel_file argument's basename is the filename but the wheel file
-    is expected to be found in the dest_dir e.g.:
-
-        $ cibw_repair_wheel_licenses.py dist wheels/foo-1.0.whl
-
-    means that the wheel is expected to be found at dist/foo-1.0.whl.
-
-    This command overwrites the wheel file in place.
+    The wheel_file argument should be the path to the wheel file to be repaired.
+    It will be overwritten in place.
     """
     parser = argparse.ArgumentParser()
-    parser.add_argument("dest_dir")
     parser.add_argument("wheel_file")
     parser.add_argument("--license", action="append", default=[])
     parser.add_argument("--license-file", action="append", default=[])
 
     parsed = parser.parse_args(args)
-    dest_dir = Path(parsed.dest_dir)
     wheel_file = Path(parsed.wheel_file)
     licenses = parsed.license
     license_files = [Path(f) for f in parsed.license_file]
@@ -52,27 +44,26 @@ def main(*args: str):
         #
         raise ValueError("license-file paths must be relative to project root")
 
-    update_licenses_wheel(dest_dir, wheel_file, licenses, license_files)
+    update_licenses_wheel(wheel_file, licenses, license_files)
 
 
 def update_licenses_wheel(
-    dest_dir: Path, wheel_file: Path, licenses: list[str], license_files: list[Path]
+    wheel_file: Path, licenses: list[str], license_files: list[Path]
 ):
     # foo/bar-1.0-cp310-cp310-linux_x86_64.whl -> bar-1.0
     name, version = wheel_file.stem.split('-')[:2]
-    wheel_path = dest_dir / wheel_file.name
-    if wheel_path.exists():
-        print("Found wheel at", wheel_path)
+    if wheel_file.exists():
+        print("Found wheel at", wheel_file)
     else:
-        raise ValueError(f"Wheel not found at {wheel_path}")
+        raise ValueError(f"Wheel not found at {wheel_file}")
 
     base = f"{name}-{version}"
 
     with TemporaryDirectory() as tmpdir:
 
         tmpdir = Path(tmpdir)
         print("temp dir:", tmpdir)
-        run(["wheel", "unpack", "--dest", tmpdir, wheel_path], check=True)
+        run(["wheel", "unpack", "--dest", tmpdir, wheel_file], check=True)
         dist_info = tmpdir / base / f"{base}.dist-info"
 
         print(f"Adding licenses in {dist_info}")
@@ -88,14 +79,16 @@ def update_licenses_wheel(
         new_wheel_file = wheels[0]
 
         print(f"Repaired wheel: {new_wheel_file}")
-        print(f"Copying to {wheel_path}")
-        copyfile(new_wheel_file, wheel_path)
+        print(f"Copying back to: {wheel_file}")
+        copyfile(new_wheel_file, wheel_file)
 
 
 def update_license_dist_info(
     dist_info: Path, licenses: list[str], license_files: list[Path]
 ):
     for license_file in license_files:
+        if license_file.exists():
+            raise ValueError(f"license file already present: {license_file}")
         makedirs(dist_info / license_file.parent, exist_ok=True)
         copyfile(license_file, dist_info / license_file)
         print(f"Added license file {license_file}")

pyproject.toml

@@ -114,28 +114,28 @@ PKG_CONFIG_PATH = "$(pwd)/.local/lib/pkgconfig"
 before-all = "bin/cibw_before_all_linux_$(uname -m).sh"
 before-build = "pip install wheel auditwheel"
 repair-wheel-command = [
-    "auditwheel repair -w {dest_dir} {wheel}",
-    """bin/cibw_repair_wheel_licenses.py {dest_dir} {wheel} \
+    """bin/cibw_repair_wheel_licenses.py {wheel} \
             --license-file wheels/LICENSE_linux_wheels.txt \
     """,
+    "auditwheel repair -w {dest_dir} {wheel}",
 ]
 
 [tool.cibuildwheel.macos]
 before-all = "bin/cibw_before_all_macosx_$(uname -m).sh"
 before-build = "pip install wheel delocate"
 repair-wheel-command = [
-    "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}",
-    """bin/cibw_repair_wheel_licenses.py {dest_dir} {wheel}  \
+    """bin/cibw_repair_wheel_licenses.py {wheel} \
             --license-file wheels/LICENSE_macos_wheels.txt \
     """,
+    "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}",
 ]
 
 [tool.cibuildwheel.windows]
 before-all = "C:\\msys64\\usr\\bin\\bash bin/cibw_before_all_windows.sh"
 before-build = "pip install wheel delvewheel"
 repair-wheel-command = [
-    "delvewheel repair -w {dest_dir} {wheel} --add-path .local/bin",
-    """bin/cibw_repair_wheel_licenses.py {dest_dir} {wheel}   \
+    """bin/cibw_repair_wheel_licenses.py {wheel} \
             --license-file wheels/LICENSE_windows_wheels.txt \
     """,
+    "delvewheel repair -w {dest_dir} {wheel} --add-path .local/bin",
 ]