Updated the retag_wheel_py3-none.py file with new content.

Author: MarcCote

.github/workflows/release.yml

@@ -45,12 +45,13 @@ jobs:
           CIBW_ARCHS: native  # avoid building extra archs unintentionally
           CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
           CIBW_BUILD_VERBOSITY: 1
-
-          # Retag to py3-none-<platform>
-          CIBW_REPAIR_WHEEL_COMMAND: "python tools/retag_wheel_py3-none.py {wheel}"
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: ${{ matrix.platform_id == 'macosx_arm64' && 'delocate-wheel -w {dest_dir} -v {wheel}' || 'delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}' }}
         with:
           output-dir: wheelhouse
 
+      - name: Retag wheels to py3-none-<platform>
+        run: python tools/retag_wheel_py3-none.py wheelhouse
+
       - name: Install dependencies (Linux)
         run: sudo apt update && sudo apt install -y --no-install-recommends graphviz
         if: startsWith(matrix.os, 'ubuntu')
@@ -127,3 +128,4 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           skip-existing: true
+          verbose: true

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest-large]
+        os: [ubuntu-latest, macos-latest-large, macos-latest]
         python: ['3.10', '3.12']
     steps:
       - uses: actions/checkout@v5

tools/retag_wheel_py3-none.py

@@ -1,77 +1,61 @@
-"""
-Rewrite wheel tags from cp312-cp312-PLATFORM to py3-none-PLATFORM.
-
-This is appropriate when the wheel contains OS-specific non-Python binaries
-(e.g., Inform7) but no Python extension modules (ABI-independent).
-"""
+"""Retag wheel from cpXYZ-cpXYZ-PLATFORM to py3-none-PLATFORM."""
 
 import argparse
 import os
-import re
 import zipfile
 from pathlib import Path
 
 
-WHEEL_TAG_RE = re.compile(r"^Tag:\s*(\S+)\s*$")
-
-
-def parse_platform_tag(filename: str) -> str:
-    # {dist}-{ver}-{python tag}-{abi tag}-{platform tag}.whl
-    m = re.match(r"^.+-[^-]+-[^-]+-(?P<plat>.+)\.whl$", filename)
-    if not m:
-        raise ValueError(f"Cannot parse wheel filename: {filename}")
-    return m.group("plat")
-
-
 def retag(path: Path) -> Path:
-    plat = parse_platform_tag(path.name)
-    new_name = re.sub(r"-[^-]+-[^-]+-" + re.escape(plat) + r"\.whl$", f"-py3-none-{plat}.whl", path.name)
-    # If the regex didn't match (unexpected format), fall back to explicit construction:
-    if new_name == path.name:
-        # Use a more explicit split
-        parts = path.name[:-4].split("-")
-        if len(parts) < 5:
-            raise ValueError(f"Unexpected wheel name: {path.name}")
-        new_name = "-".join(parts[:-3] + ["py3", "none", parts[-1]]) + ".whl"
-
+    # 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"
     out = path.with_name(new_name)
 
-    with zipfile.ZipFile(path, "r") as zin, zipfile.ZipFile(out, "w", compression=zipfile.ZIP_DEFLATED) as zout:
-        wheel_files = [n for n in zin.namelist() if n.endswith(".dist-info/WHEEL")]
-        if len(wheel_files) != 1:
-            raise RuntimeError(f"Expected exactly one .dist-info/WHEEL, found: {wheel_files}")
-        wheel_meta = wheel_files[0]
+    with zipfile.ZipFile(path, "r") as zin, zipfile.ZipFile(
+        out, "w", compression=zipfile.ZIP_DEFLATED
+    ) as zout:
+        wheel_meta = next(n for n in zin.namelist() if n.endswith(".dist-info/WHEEL"))
 
         for info in zin.infolist():
             data = zin.read(info.filename)
-            if info.filename == wheel_meta:
-                text = data.decode("utf-8")
-                lines = text.splitlines(True)
-
-                kept = []
-                for line in lines:
-                    if WHEEL_TAG_RE.match(line.strip()):
-                        continue
-                    kept.append(line)
 
-                kept.append(f"Tag: py3-none-{plat}\n")
-                data = "".join(kept).encode("utf-8")
+            if info.filename == wheel_meta:
+                lines = data.decode("utf-8").splitlines(keepends=True)
+                # Remove existing Tag: lines and add new one
+                lines = [l for l in lines if not l.strip().startswith("Tag:")]
+                if lines and not lines[-1].endswith("\n"):
+                    lines[-1] += "\n"
+                lines.append(f"Tag: py3-none-{platform}\n")
+                data = "".join(lines).encode("utf-8")
 
             zout.writestr(info, data)
 
-    # Remove original so only retagged wheel remains
-    os.remove(path)
+    try:
+        os.remove(path)
+    except OSError:
+        pass
+
     return out
 
 
 def main() -> None:
-    ap = argparse.ArgumentParser()
-    ap.add_argument("wheel", nargs="+")
-    args = ap.parse_args()
+    parser = argparse.ArgumentParser()
+    parser.add_argument("dest_dir", type=Path, help="Directory containing wheels to retag")
+    args = parser.parse_args()
+
+    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))
-        print(f"Retagged: {w} -> {out.name}")
+    for wheel in wheels:
+        out = retag(wheel)
+        print(f"Retagged: {wheel.name} -> {out.name}")
 
 
 if __name__ == "__main__":