Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 0c29f5f

Browse files
David Robertsonclokep
andauthored
Hacky fix to make mac wheels (#15019)
* Skip testing PyPy wheels One of the test builds on #15015 failed to install a pp38-* wheel because it didn't have access to the openssl headers to build `cryptography` from source. We don't run CI against PyPy so I'm going to be a meanie and skip testing the wheels. (And I've no idea why 3.8 was special in the first place, either.) * Hack the name of the wheel so cibw can test it I hate hate hate hate hate hate hate hate hate this * Changelog * Apply suggestions from code review Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> --------- Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
1 parent 4142dca commit 0c29f5f

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.ci/scripts/auditwheel_wrapper.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ def cpython(wheel_file: str, name: str, version: Version, tag: Tag) -> str:
5050

5151
check_is_abi3_compatible(wheel_file)
5252

53-
abi3_tag = Tag(tag.interpreter, "abi3", tag.platform)
53+
# HACK: it seems that some older versions of pip will consider a wheel marked
54+
# as macosx_11_0 as incompatible with Big Sur. I haven't done the full archaeology
55+
# here; there are some clues in
56+
# https://github.com/pantsbuild/pants/pull/12857
57+
# https://github.com/pypa/pip/issues/9138
58+
# https://github.com/pypa/packaging/pull/319
59+
# Empirically this seems to work, note that macOS 11 and 10.16 are the same,
60+
# both versions are valid for backwards compatibility.
61+
platform = tag.platform.replace("macosx_11_0", "macosx_10_16")
62+
abi3_tag = Tag(tag.interpreter, "abi3", platform)
5463

5564
dirname = os.path.dirname(wheel_file)
5665
new_wheel_file = os.path.join(

.github/workflows/release-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
env:
149149
# Skip testing for platforms which various libraries don't have wheels
150150
# for, and so need extra build deps.
151-
CIBW_TEST_SKIP: pp3{7,9}-* *i686* *musl*
151+
CIBW_TEST_SKIP: pp3*-* *i686* *musl*
152152
# Fix Rust OOM errors on emulated aarch64: https://github.com/rust-lang/cargo/issues/10583
153153
CARGO_NET_GIT_FETCH_WITH_CLI: true
154154
CIBW_ENVIRONMENT_PASS_LINUX: CARGO_NET_GIT_FETCH_WITH_CLI

changelog.d/15019.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix creation of wheels on macOS.

0 commit comments

Comments
 (0)