Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/release-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ jobs:
github.event_name == 'pull_request' &&
github.event.action != 'closed' &&
github.event.pull_request.head.ref == 'release/pact-python-cli'
)
) ||
always()
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -234,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-cli
env:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release-ffi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ jobs:
github.event_name == 'pull_request' &&
github.event.action != 'closed' &&
github.event.pull_request.head.ref == 'release/pact-python-ffi'
)
) ||
always()
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -235,7 +236,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:
Expand Down
8 changes: 0 additions & 8 deletions pact-python-cli/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
37 changes: 2 additions & 35 deletions pact-python-ffi/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/<TBD>
"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]
Expand Down
Loading