Fix retagging

Author: MarcCote

.github/workflows/release.yml

@@ -46,7 +46,7 @@ jobs:
           CIBW_BUILD_VERBOSITY: 1
 
           # Retag to py3-none-<platform>
-          CIBW_REPAIR_WHEEL_COMMAND: "python tools/retag_wheel_py3-none.py -w {dest_dir} {wheel}"
+          CIBW_REPAIR_WHEEL_COMMAND: "auditwheel repair -w {dest_dir} {wheel} && python tools/retag_wheel_py3-none.py {dest_dir}"
         with:
           output-dir: wheelhouse
 

tools/retag_wheel_py3-none.py

@@ -6,16 +6,12 @@
 from pathlib import Path
 
 
-def retag(path: Path, dest_dir: Path = None) -> Path:
+def retag(path: Path) -> Path:
     # Extract platform tag from filename: name-ver-pytag-abi-platform.whl
     parts = path.stem.split("-")
     platform = parts[-1]
     new_name = "-".join(parts[:-3] + ["py3", "none", platform]) + ".whl"
-
-    if dest_dir:
-        out = dest_dir / new_name
-    else:
-        out = path.with_name(new_name)
+    out = path.with_name(new_name)
 
     with zipfile.ZipFile(path, "r") as zin, zipfile.ZipFile(
         out, "w", compression=zipfile.ZIP_DEFLATED
@@ -46,16 +42,20 @@ def retag(path: Path, dest_dir: Path = None) -> Path:
 
 def main() -> None:
     parser = argparse.ArgumentParser()
-    parser.add_argument("wheel", nargs="+")
-    parser.add_argument("-w", dest="dest_dir", type=Path, help="Destination directory for retagged wheels")
+    parser.add_argument("dest_dir", type=Path, help="Directory containing wheels to retag")
     args = parser.parse_args()
 
-    if args.dest_dir:
-        args.dest_dir.mkdir(parents=True, exist_ok=True)
+    if not args.dest_dir.is_dir():
+        raise ValueError(f"Directory not found: {args.dest_dir}")
+
+    wheels = list(args.dest_dir.glob("*.whl"))
+    if not wheels:
+        print(f"No wheels found in {args.dest_dir}")
+        return
 
-    for w in args.wheel:
-        out = retag(Path(w), args.dest_dir)
-        print(f"Retagged: {w} -> {out}")
+    for wheel in wheels:
+        out = retag(wheel)
+        print(f"Retagged: {wheel.name} -> {out.name}")
 
 
 if __name__ == "__main__":