Fixed some syntax errors in the Windows wheel build.

Author: Fantasy201

.github/workflows/python-app.yml

@@ -565,16 +565,7 @@ jobs:
             python -m pip install --upgrade pip
             python -m pip install delvewheel
 
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: |
-            # All DLL discovery and delvewheel invocation is handled inside
-            # repair_windows_wheel.py to avoid YAML multi-line shell quoting
-            # issues (nested if/else blocks at deep indentation caused the
-            # script to be duplicated verbatim in the executed shell command).
-            python "{project}/maintenance_scripts/repair_windows_wheel.py" "{dest_dir}" "{wheel}"
-
-            echo "=== delvewheel show repaired wheel ==="
-            python -c "import glob, subprocess; wheels = sorted(glob.glob(r'{dest_dir}/*.whl')); assert wheels, 'No repaired wheel found'; [subprocess.run(['delvewheel', 'show', wheel], check=True) for wheel in wheels]"
-            python -c "import glob, zipfile; wheels = sorted(glob.glob(r'{dest_dir}/*.whl')); assert wheels, 'No repaired wheel found'; found = {wheel: [name for name in zipfile.ZipFile(wheel).namelist() if name.startswith('sequenzo.libs/') and name.lower().endswith('.dll') and 'libomp140' in name.lower()] for wheel in wheels}; missing = [wheel for wheel, dlls in found.items() if not dlls]; assert not missing, 'Missing bundled libomp140*.dll in sequenzo.libs for: ' + ', '.join(missing); print('[OK] bundled OpenMP DLLs:', found)"
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python "{project}/maintenance_scripts/repair_windows_wheel.py" "{dest_dir}" "{wheel}"
 
           # 注意：CIBW_BEFORE_BUILD（通用）在所有平台都提供了平台专用版本时
           # 永远不会执行（平台专用变体会覆盖通用变体），已移除死代码。

maintenance_scripts/repair_windows_wheel.py

@@ -151,7 +151,7 @@ def main() -> int:
     if run_delvewheel(dest, wheel, omp_bin):
         repaired = sorted(dest.glob("*.whl"))[0]
         print(f"[repair] Repaired wheel (delvewheel): {repaired}")
-        return 0
+        return _finalize_repaired_wheel(repaired)
 
     # --- Step 3: safety net — copy built wheel as-is ---
     print("[repair] delvewheel did not emit a wheel; copying built wheel as-is.")
@@ -162,6 +162,33 @@ def main() -> int:
         return 1
 
     print(f"[repair] Repaired wheel (copied as-is): {target}")
+    return _finalize_repaired_wheel(target)
+
+
+def _verify_bundled_openmp(wheel_path: Path) -> None:
+    import zipfile
+
+    with zipfile.ZipFile(wheel_path) as zf:
+        dlls = [
+            name
+            for name in zf.namelist()
+            if name.startswith("sequenzo.libs/")
+            and name.lower().endswith(".dll")
+            and "libomp140" in name.lower()
+        ]
+    if not dlls:
+        print(
+            f"[repair] ERROR: missing bundled libomp140*.dll in sequenzo.libs for {wheel_path}",
+            file=sys.stderr,
+        )
+        raise SystemExit(1)
+    print(f"[OK] bundled OpenMP DLLs: {dlls}")
+
+
+def _finalize_repaired_wheel(wheel_path: Path) -> int:
+    print("=== delvewheel show repaired wheel ===")
+    subprocess.run(["delvewheel", "show", str(wheel_path)], check=True)
+    _verify_bundled_openmp(wheel_path)
     return 0
 
 

tests/test_build_release_boundaries.py

@@ -29,8 +29,10 @@ def test_macos_wheel_repair_fails_instead_of_copying_unrepaired_wheel():
     assert 'CIBW_TARGET_OSX_arm64: "11.0"' in source
     assert "build_macos_ci_libomp.sh" in source
     assert "repair_windows_wheel.py" in source
+    assert 'CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python "{project}/maintenance_scripts/repair_windows_wheel.py"' in source
     repair_script = (repo_root / "maintenance_scripts" / "repair_windows_wheel.py").read_text()
     assert "delvewheel did not emit a wheel; copying built wheel as-is" in repair_script
+    assert "bundled OpenMP DLLs" in repair_script
     assert (repo_root / "maintenance_scripts" / "repair_windows_wheel.py").is_file()
     assert "exit 1" in source
     assert (repo_root / "maintenance_scripts" / "build_macos_ci_libomp.sh").is_file()