diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 35948b713..772c8fcc3 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -234,7 +234,7 @@ jobs: uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Build wheels - uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1 + uses: pypa/cibuildwheel@294735312765b09d24a2fbec22660ce817587d55 # v4.1.0 with: package-dir: pact-python-cli env: diff --git a/.github/workflows/release-ffi.yml b/.github/workflows/release-ffi.yml index f7992436c..b2a81106d 100644 --- a/.github/workflows/release-ffi.yml +++ b/.github/workflows/release-ffi.yml @@ -235,7 +235,7 @@ jobs: uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Build wheels - uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1 + uses: pypa/cibuildwheel@294735312765b09d24a2fbec22660ce817587d55 # v4.1.0 with: package-dir: pact-python-ffi env: diff --git a/pact-python-cli/pyproject.toml b/pact-python-cli/pyproject.toml index f8bbc37cf..a31506453 100644 --- a/pact-python-cli/pyproject.toml +++ b/pact-python-cli/pyproject.toml @@ -72,14 +72,6 @@ build-backend = "hatchling.build" [tool.cibuildwheel.windows] archs = ["auto64"] - [[tool.cibuildwheel.overrides]] - environment.MACOSX_DEPLOYMENT_TARGET = "10.13" - select = "*-macosx_x86_64" - - [[tool.cibuildwheel.overrides]] - environment.MACOSX_DEPLOYMENT_TARGET = "11.0" - select = "*-macosx_arm64" - [tool.coverage] [tool.coverage.paths] pact-cli = ["/src/pact_cli"] diff --git a/pact-python-ffi/pyproject.toml b/pact-python-ffi/pyproject.toml index c639b8579..4a2555f27 100644 --- a/pact-python-ffi/pyproject.toml +++ b/pact-python-ffi/pyproject.toml @@ -53,48 +53,15 @@ build-backend = "hatchling.build" [tool.cibuildwheel] environment.HATCH_VERBOSE = "1" - [tool.cibuildwheel.linux] - before-build = ["uv pip install --system abi3audit"] - environment.PACT_LIB_DIR = "/tmp/pact_ffi" - repair-wheel-command = [ - "export LD_LIBRARY_PATH=\"$PACT_LIB_DIR:$LD_LIBRARY_PATH\"", - "auditwheel repair -w {dest_dir} {wheel}", - "abi3audit --strict --report {wheel}", - ] - - [tool.cibuildwheel.macos] - before-build = ["pip install abi3audit"] - environment.PACT_LIB_DIR = "/tmp/pact_ffi" - repair-wheel-command = [ - "export DYLD_LIBRARY_PATH=\"$PACT_LIB_DIR:$DYLD_LIBRARY_PATH\"", - "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}", - "abi3audit --strict --report {wheel}", - ] - [tool.cibuildwheel.windows] archs = ["auto64"] - before-build = ["pip install abi3audit delvewheel"] environment.PACT_LIB_DIR = "C:/tmp/pact_ffi" - repair-wheel-command = [ - # ext-ms-* DLLs are no-export forwarding stubs present in System32 on all - # modern Windows. delvewheel 1.12.0 removed them from its no-bundle list - # (they have no exports so the author assumed nothing links to them), but - # they do appear in DLL import tables and cannot be bundled. Exclude the - # whole ext-ms-* family until upstream fixes ignore_regexes. - # See: https://github.com/adang1345/delvewheel/issues/ - "delvewheel repair -vv --add-path \"%PACT_LIB_DIR%\" --exclude \"ext-ms-*\" -w {dest_dir} {wheel}", - "abi3audit --strict --report {wheel}", - ] - - [[tool.cibuildwheel.overrides]] - environment.MACOSX_DEPLOYMENT_TARGET = "12.0" - inherit.environment = "append" - select = "*-macosx_x86_64" + environment.PATH = "C:/tmp/pact_ffi;$PATH" [[tool.cibuildwheel.overrides]] environment.MACOSX_DEPLOYMENT_TARGET = "12.0" inherit.environment = "append" - select = "*-macosx_arm64" + select = "*-macosx_*" [tool.coverage] [tool.coverage.paths]