From 7a1136ed9c873dcdcc32b0160a0d26e643583d0f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 14 Oct 2021 09:20:14 -0400 Subject: [PATCH 1/2] ci: try macOS 11 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8203f6f8..97b2bedd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-11] python_version: ['3.10'] timeout-minutes: 180 steps: From 7dabbee59c6de720de7a1d92859d0de435125948 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 14 Oct 2021 10:38:44 -0400 Subject: [PATCH 2/2] fix: remove PyPy macOS 11 filtering --- cibuildwheel/macos.py | 23 +---------------------- test/utils.py | 5 ----- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index d8f6dbc5..4a43effc 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -90,28 +90,7 @@ def get_python_configurations( ] # skip builds as required by BUILD/SKIP - python_configurations = [c for c in python_configurations if build_selector(c.identifier)] - - # When running on macOS 11 and x86_64, the reported OS is '10.16', but - # there is no such OS - it really means macOS 11. - if get_macos_version() >= (10, 16): - if any(c.identifier.startswith("pp") for c in python_configurations): - # pypy doesn't work on macOS 11 yet - # See https://foss.heptapod.net/pypy/pypy/-/issues/3314 - log.warning( - unwrap( - """ - PyPy is currently unsupported when building on macOS 11. To build macOS PyPy - wheels, build on an older OS, such as macOS 10.15. To silence this warning, - deselect PyPy by adding "pp*-macosx*" to your CIBW_SKIP option. - """ - ) - ) - python_configurations = [ - c for c in python_configurations if not c.identifier.startswith("pp") - ] - - return python_configurations + return [c for c in python_configurations if build_selector(c.identifier)] SYMLINKS_DIR = Path("/tmp/cibw_bin") diff --git a/test/utils.py b/test/utils.py index 524f7747..34632c20 100644 --- a/test/utils.py +++ b/test/utils.py @@ -132,11 +132,6 @@ def expected_wheels( if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]: python_abi_tags += ["pp37-pypy37_pp73"] - if platform == "macos" and get_macos_version() >= (10, 16): - # 10.16 is sometimes reported as the macOS version on macOS 11. - # pypy not supported on macOS 11. - python_abi_tags = [t for t in python_abi_tags if not t.startswith("pp")] - if platform == "macos" and machine_arch == "arm64": # currently, arm64 macs are only supported by cp39 & cp310 python_abi_tags = ["cp39-cp39", "cp310-cp310"]