fix: repair linux wheels with auditwheel

Author: BayernMuller

.github/workflows/_wheel-build.yml

@@ -34,7 +34,9 @@ jobs:
       CPPLLVM_DOWNLOAD_DIR: ${{ github.workspace }}/.cache/${{ inputs.package_name }}-downloads
       CIBW_ARCHS: ${{ inputs.cibw_archs }}
       MACOSX_DEPLOYMENT_TARGET: ${{ inputs.macos_deployment_target }}
-      CIBW_REPAIR_WHEEL_COMMAND: ""
+      CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair -w {dest_dir} {wheel}"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: ""
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

.github/workflows/release-cformat.yml

@@ -40,7 +40,9 @@ jobs:
       CPPLLVM_DOWNLOAD_DIR: ${{ github.workspace }}/.cache/cformat-downloads
       CIBW_ARCHS: ${{ matrix.cibw_archs }}
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos_deployment_target }}
-      CIBW_REPAIR_WHEEL_COMMAND: ""
+      CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair -w {dest_dir} {wheel}"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: ""
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

.github/workflows/release-ctidy.yml

@@ -40,7 +40,9 @@ jobs:
       CPPLLVM_DOWNLOAD_DIR: ${{ github.workspace }}/.cache/ctidy-downloads
       CIBW_ARCHS: ${{ matrix.cibw_archs }}
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos_deployment_target }}
-      CIBW_REPAIR_WHEEL_COMMAND: ""
+      CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair -w {dest_dir} {wheel}"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: ""
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

cppllvm_build.py

@@ -34,8 +34,6 @@
     ("Windows", "amd64"): ("windows-amd64", ".exe"),
 }
 
-LINUX_WHEEL_PLATFORM_TAG = "manylinux_2_17_x86_64.manylinux2014_x86_64"
-
 
 @dataclass(frozen=True)
 class PackageBuildConfig:
@@ -122,14 +120,6 @@ def checksum_asset_name(config: PackageBuildConfig, stem: str) -> str:
     return f"{stem}-{llvm_major_version(config)}_{platform_name}.sha512sum"
 
 
-def wheel_platform_tag(default_platform_tag: str) -> str:
-    host_system = system()
-    host_machine = machine().lower()
-    if host_system == "Linux" and host_machine in {"x86_64", "amd64"}:
-        return LINUX_WHEEL_PLATFORM_TAG
-    return default_platform_tag
-
-
 def cached_download(url: str, destination: Path, *, package_name: str) -> Path:
     if destination.exists() and destination.stat().st_size > 0:
         return destination
@@ -272,6 +262,6 @@ def finalize_options(self) -> None:
 
         def get_tag(self) -> tuple[str, str, str]:
             _, _, platform_tag = super().get_tag()
-            return "py3", "none", wheel_platform_tag(platform_tag)
+            return "py3", "none", platform_tag
 
     return build_py, bdist_wheel

packages/cformat/cppllvm_build.py

@@ -34,8 +34,6 @@
     ("Windows", "amd64"): ("windows-amd64", ".exe"),
 }
 
-LINUX_WHEEL_PLATFORM_TAG = "manylinux_2_17_x86_64.manylinux2014_x86_64"
-
 
 @dataclass(frozen=True)
 class PackageBuildConfig:
@@ -122,14 +120,6 @@ def checksum_asset_name(config: PackageBuildConfig, stem: str) -> str:
     return f"{stem}-{llvm_major_version(config)}_{platform_name}.sha512sum"
 
 
-def wheel_platform_tag(default_platform_tag: str) -> str:
-    host_system = system()
-    host_machine = machine().lower()
-    if host_system == "Linux" and host_machine in {"x86_64", "amd64"}:
-        return LINUX_WHEEL_PLATFORM_TAG
-    return default_platform_tag
-
-
 def cached_download(url: str, destination: Path, *, package_name: str) -> Path:
     if destination.exists() and destination.stat().st_size > 0:
         return destination
@@ -272,6 +262,6 @@ def finalize_options(self) -> None:
 
         def get_tag(self) -> tuple[str, str, str]:
             _, _, platform_tag = super().get_tag()
-            return "py3", "none", wheel_platform_tag(platform_tag)
+            return "py3", "none", platform_tag
 
     return build_py, bdist_wheel

packages/cformat/pyproject.toml

@@ -45,5 +45,4 @@ prebuilt_release_tag = "master-796e77c"
 
 [tool.cibuildwheel]
 build-verbosity = 1
-repair-wheel-command = ""
 test-command = "python -c \"import importlib.resources as resources, os, subprocess; from cformat import __version__; data = resources.files('cformat').joinpath('data'); binary = 'clang-format.exe' if os.name == 'nt' else 'clang-format'; assert data.joinpath('bin', binary).is_file(); subprocess.check_call(['cformat', '--help']); subprocess.check_call(['cformat', '--version'])\""

packages/ctidy/cppllvm_build.py

@@ -34,8 +34,6 @@
     ("Windows", "amd64"): ("windows-amd64", ".exe"),
 }
 
-LINUX_WHEEL_PLATFORM_TAG = "manylinux_2_17_x86_64.manylinux2014_x86_64"
-
 
 @dataclass(frozen=True)
 class PackageBuildConfig:
@@ -122,14 +120,6 @@ def checksum_asset_name(config: PackageBuildConfig, stem: str) -> str:
     return f"{stem}-{llvm_major_version(config)}_{platform_name}.sha512sum"
 
 
-def wheel_platform_tag(default_platform_tag: str) -> str:
-    host_system = system()
-    host_machine = machine().lower()
-    if host_system == "Linux" and host_machine in {"x86_64", "amd64"}:
-        return LINUX_WHEEL_PLATFORM_TAG
-    return default_platform_tag
-
-
 def cached_download(url: str, destination: Path, *, package_name: str) -> Path:
     if destination.exists() and destination.stat().st_size > 0:
         return destination
@@ -272,6 +262,6 @@ def finalize_options(self) -> None:
 
         def get_tag(self) -> tuple[str, str, str]:
             _, _, platform_tag = super().get_tag()
-            return "py3", "none", wheel_platform_tag(platform_tag)
+            return "py3", "none", platform_tag
 
     return build_py, bdist_wheel

packages/ctidy/pyproject.toml

@@ -48,5 +48,4 @@ prebuilt_release_tag = "master-796e77c"
 
 [tool.cibuildwheel]
 build-verbosity = 1
-repair-wheel-command = ""
 test-command = "python -c \"import importlib.resources as resources, os, subprocess; from ctidy import __version__; data = resources.files('ctidy').joinpath('data'); binary = 'clang-tidy.exe' if os.name == 'nt' else 'clang-tidy'; assert data.joinpath('bin', binary).is_file(); assert data.joinpath('bin', 'run-clang-tidy.py').is_file(); assert data.joinpath('lib', 'clang', __version__.split('.', 1)[0], 'include').is_dir(); subprocess.check_call(['ctidy', '--help']); subprocess.check_call(['ctidy', '--version'])\""

tests/test_cppllvm_build.py

@@ -9,12 +9,10 @@
 from setuptools.errors import SetupError
 
 from cppllvm_build import (
-    LINUX_WHEEL_PLATFORM_TAG,
     PackageBuildConfig,
     asset_name,
     checksum_asset_name,
     current_platform,
-    wheel_platform_tag,
 )
 
 
@@ -78,14 +76,6 @@ def test_cformat_asset_name_uses_package_version(self, *_args: object) -> None:
             "clang-format-20_windows-amd64.sha512sum",
         )
 
-    @patch("cppllvm_build.machine", return_value="x86_64")
-    @patch("cppllvm_build.system", return_value="Linux")
-    def test_linux_wheel_platform_tag_uses_manylinux(self, *_args: object) -> None:
-        self.assertEqual(
-            wheel_platform_tag("linux_x86_64"),
-            LINUX_WHEEL_PLATFORM_TAG,
-        )
-
     @patch("cppllvm_build.machine", return_value="arm64")
     @patch("cppllvm_build.system", return_value="Linux")
     def test_unsupported_platform_raises_clear_error(self, *_args: object) -> None: