From 2ca2d496776b63a90e9ab6a6bce03c45cba10d11 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:17:17 +0100 Subject: [PATCH 1/3] Update cibuildwheel to 2.16.5 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c93f1b5f..82afb3a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: git -C mypy checkout $(cat mypy_commit) - name: Install cibuildwheel and pypyp run: | - pipx install cibuildwheel==2.16.2 + pipx install cibuildwheel==2.16.5 pipx install pypyp==1 - id: set-matrix run: | @@ -62,7 +62,7 @@ jobs: git clone https://github.com/python/mypy.git --recurse-submodules git -C mypy checkout $(cat mypy_commit) - - uses: pypa/cibuildwheel@v2.16.2 + - uses: pypa/cibuildwheel@v2.16.5 with: config-file: cibuildwheel.toml package-dir: mypy From a1f36a414ac10260d5e710cf8e8321bf52355107 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:18:00 +0100 Subject: [PATCH 2/3] Update mypy commit --- mypy_commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy_commit b/mypy_commit index a20204d4..a49041a9 100644 --- a/mypy_commit +++ b/mypy_commit @@ -1 +1 @@ -b1ba661122dc39d9bbc53cf5df334c9f56b1a729 +e40935e5e0b55bee9379e35aa27216c3e0287b13 From ff30a80280f6cf6c449baa5a1b542e2a7f6d073a Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:34:01 +0100 Subject: [PATCH 3/3] Enable testing for macOS arm64 builds --- .github/workflows/build.yml | 2 +- cibuildwheel.toml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82afb3a1..6fc95f11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: cibuildwheel --config-file=cibuildwheel.toml --print-build-identifiers --platform linux mypy \ | pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' \ && cibuildwheel --config-file=cibuildwheel.toml --print-build-identifiers --platform macos mypy \ - | pyp 'json.dumps({"only": x, "os": "macos-latest"})' \ + | pyp 'json.dumps({"only": x, "os": "macos-14"})' \ && cibuildwheel --config-file=cibuildwheel.toml --print-build-identifiers --platform windows mypy \ | pyp 'json.dumps({"only": x, "os": "windows-latest"})' } | pyp 'json.dumps(list(map(json.loads, lines)))' diff --git a/cibuildwheel.toml b/cibuildwheel.toml index d6c6e31b..91a70dd9 100644 --- a/cibuildwheel.toml +++ b/cibuildwheel.toml @@ -10,12 +10,6 @@ skip = [ "pp*", ] -# Apple Silicon support -# When cross-compiling on Intel, it is not possible to test arm64. -# Warnings will be silenced with the following CIBW_TEST_SKIP. -macos.archs = ["x86_64", "arm64"] -test-skip = "*-macosx_arm64" - build-verbosity = 1 linux.before-all = [