cibuildwheel: Add macOS arm64 support

arvidn · Oct 8, 2024 · ca610f2 · ca610f2
1 parent a3cdc51
commit ca610f2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 36 deletions.
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -6,7 +6,7 @@ name: cibuildwheel
 # sample.
 
 # The full list of cibuildwheel's build targets can be found here:
-# https://github.com/pypa/cibuildwheel/blob/v2.16.5/cibuildwheel/resources/build-platforms.toml
+# https://github.com/pypa/cibuildwheel/blob/v2.21.2/cibuildwheel/resources/build-platforms.toml
 
 # Notes on build targets we (don't) support:
 # - pypy: libtorrent doesn't build with pypy as of writing
@@ -45,22 +45,29 @@ jobs:
       MATRIX_PULL_REQUEST: |
         {
           "include": [
-            {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-manylinux_*", "CIBW_ARCHS": "x86_64"},
-            {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-musllinux_*", "CIBW_ARCHS": "x86_64"},
-            {"os": "macos-12", "CIBW_BUILD": "cp39-*", "CIBW_ARCHS": "x86_64"},
-            {"os": "windows-2022", "CIBW_BUILD": "cp39-*", "CIBW_ARCHS": "AMD64"}
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-manylinux_x86_64", "CIBW_ARCHS_LINUX": "x86_64"},
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-manylinux_aarch64", "CIBW_ARCHS_LINUX": "aarch64"},
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-musllinux_x86_64", "CIBW_ARCHS_LINUX": "x86_64"},
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-musllinux_aarch64", "CIBW_ARCHS_LINUX": "aarch64"},
+            {"os": "macos-13", "CIBW_BUILD": "cp39-macosx_x86_64", "MACOSX_DEPLOYMENT_TARGET": "13"},
+            {"os": "macos-14", "CIBW_BUILD": "cp39-macosx_arm64", "MACOSX_DEPLOYMENT_TARGET": "14"},
+            {"os": "windows-latest", "CIBW_BUILD": "cp39-win32", "CIBW_ARCHS_WINDOWS": "x86"},
+            {"os": "windows-latest", "CIBW_BUILD": "cp39-win_amd64", "CIBW_ARCHS_WINDOWS": "AMD64"}
           ]
         }
       MATRIX_WORKFLOW_DISPATCH: |
         {
           "include": [
-            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_*", "CIBW_ARCHS": "x86_64"},
-            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_*", "CIBW_ARCHS": "aarch64"},
-            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_*", "CIBW_ARCHS": "x86_64"},
-            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_*", "CIBW_ARCHS": "aarch64"},
-            {"os": "macos-12", "CIBW_BUILD": "cp*", "CIBW_ARCHS": "x86_64"},
-            {"os": "windows-2022", "CIBW_BUILD": "cp*", "CIBW_ARCHS": "x86"},
-            {"os": "windows-2022", "CIBW_BUILD": "cp*", "CIBW_ARCHS": "AMD64"}
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_x86_64"},
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_aarch64"},
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_x86_64"},
+            {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_aarch64"},
+            {"os": "macos-12", "CIBW_BUILD": "cp*-macosx_x86_64", "MACOSX_DEPLOYMENT_TARGET": "12"},
+            {"os": "macos-13", "CIBW_BUILD": "cp*-macosx_x86_64", "MACOSX_DEPLOYMENT_TARGET": "13"},
+            {"os": "macos-14", "CIBW_BUILD": "cp*-macosx_arm64", "MACOSX_DEPLOYMENT_TARGET": "14"},
+            {"os": "macos-15", "CIBW_BUILD": "cp*-macosx_arm64", "MACOSX_DEPLOYMENT_TARGET": "15"},
+            {"os": "windows-latest", "CIBW_BUILD": "cp*-win32"},
+            {"os": "windows-latest", "CIBW_BUILD": "cp*-win_amd64"}
           ]
         }
 
@@ -87,7 +94,10 @@ jobs:
     env:
       CIBW_BUILD_VERBOSITY: 1
       CIBW_BUILD: ${{ matrix.CIBW_BUILD }}
-      CIBW_ARCHS: ${{ matrix.CIBW_ARCHS }}
+      CIBW_ARCHS_LINUX:  ${{ matrix.CIBW_ARCHS_LINUX }}
+      CIBW_ARCHS_WINDOWS:  ${{ matrix.CIBW_ARCHS_WINDOWS }}
+      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.MACOSX_DEPLOYMENT_TARGET }}
+      CIBW_SKIP: pp*
       CIBW_TEST_SKIP: "*-win32"
 
     steps:
@@ -97,54 +107,58 @@ jobs:
         fetch-depth: 1
         filter: tree:0
 
+    - name: Install OpenSSL
+      if: ${{ endsWith(matrix.CIBW_BUILD, 'win32') }}
+      run: ./vcpkg install openssl:x86-windows
+
     - uses: actions/cache@v4
       id: cache-wheel
       with:
         path: wheelhouse
-        key: wheel-${{ matrix.CIBW_BUILD }}-${{ matrix.CIBW_ARCHS }}-${{ github.sha }}
+        key: wheel-${{ matrix.os }}-${{ matrix.CIBW_BUILD }}
 
     - uses: docker/setup-qemu-action@v3
       if: steps.cache-wheel.outputs.cache-hit != 'true' && runner.os == 'Linux'
 
-    - uses: pypa/cibuildwheel@v2.19.2
+    - uses: pypa/cibuildwheel@v2.21.2
       if: steps.cache-wheel.outputs.cache-hit != 'true'
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         path: wheelhouse/*.whl
-        name: wheels
+        name: wheels-${{ matrix.os }}-${{ matrix.CIBW_BUILD }}
 
   upload_pypi:
     needs: build_wheels
     runs-on: ubuntu-latest
     if: needs.build_wheels.result == 'success' && github.event.inputs.publish == 'PUBLISH'
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: wheels
+        name: wheels-${{ matrix.os }}-${{ matrix.CIBW_BUILD }}
         path: wheelhouse
 
     - uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.PYPI_API_TOKEN }}
-        packages_dir: wheelhouse
-        skip_existing: true
+        packages-dir: wheelhouse
+        skip-existing: true
 
   upload_pypi_test:
     needs: build_wheels
     runs-on: ubuntu-latest
     if: needs.build_wheels.result == 'success' && github.event.inputs.publish_test == 'PUBLISH_TEST'
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: wheels
+        name: wheels-${{ matrix.os }}-${{ matrix.CIBW_BUILD }}
         path: wheelhouse
 
     - uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        packages_dir: wheelhouse
-        skip_existing: true
+        packages-dir: wheelhouse
+        skip-existing: true
         repository_url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: install boost
         run: |
-          brew install boost-build boost openssl@1.1
+          brew install boost-build boost openssl@3
           echo "using darwin ;" >>~/user-config.jam
 
       - name: build and run tests
@@ -75,7 +75,7 @@ jobs:
 
       - name: install boost
         run: |
-          brew install boost-build boost openssl@1.1
+          brew install boost-build boost openssl@3
           echo "using darwin ;" >>~/user-config.jam
 
       - name: build and run simulations
@@ -109,7 +109,7 @@ jobs:
 
       - name: install boost
         run: |
-          brew install boost-build boost openssl@1.1
+          brew install boost-build boost openssl@3
           echo "using darwin ;" >>~/user-config.jam
 
       - name: build library

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -33,7 +33,7 @@ jobs:
     - name: dependencies (MacOS)
       if: runner.os == 'macOS'
       run: |
-        brew install boost-build boost boost-python3 python@3.12 openssl@1.1 python-setuptools
+        brew install boost-build boost boost-python3 python@3.12 openssl@3 python-setuptools
         export PATH=$(brew --prefix)/opt/python@3.12/bin:$PATH
 
     - name: update package lists (linux)

diff --git a/docs/building.rst b/docs/building.rst
@@ -76,7 +76,7 @@ Linux::
 
 Mac OS::
 
-	brew install boost-build boost openssl@1.1
+	brew install boost-build boost openssl@3
 	echo "using darwin ;" >>~/user-config.jam
 	b2 crypto=openssl cxxstd=14 release
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [project]
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 
 [tool.cibuildwheel]
 skip = "{pp*,}"
@@ -17,8 +17,7 @@ test-command = [
 [tool.cibuildwheel.macos.environment]
 BOOST_BUILD_PATH = "/tmp/boost/tools/build"
 BOOST_ROOT = "/tmp/boost"
-BOOST_VERSION = "1.81.0"
-MACOSX_DEPLOYMENT_TARGET = "12"
+BOOST_VERSION = "1.83.0"
 PATH = "/tmp/boost:$PATH"
 
 [[tool.cibuildwheel.overrides]]
@@ -38,7 +37,7 @@ test-command = [
 [tool.cibuildwheel.overrides.environment] # sub-table of previous block!
 BOOST_BUILD_PATH = "/tmp/boost/tools/build"
 BOOST_ROOT = "/tmp/boost"
-BOOST_VERSION = "1.81.0"
+BOOST_VERSION = "1.83.0"
 PATH = "/usr/local/ccache/bin:/tmp/boost:$PATH"
 
 [[tool.cibuildwheel.overrides]]
@@ -57,7 +56,7 @@ test-command = [
 [tool.cibuildwheel.overrides.environment] # sub-table of previous block!
 BOOST_BUILD_PATH = "/tmp/boost/tools/build"
 BOOST_ROOT = "/tmp/boost"
-BOOST_VERSION = "1.81.0"
+BOOST_VERSION = "1.83.0"
 PATH = "/usr/lib/ccache/bin:/tmp/boost:$PATH"
 
 [[tool.cibuildwheel.overrides]]
@@ -78,7 +77,7 @@ test-command = '''bash -c "cd '{project}/bindings/python' && python test.py"'''
 [tool.cibuildwheel.windows.environment]
 BOOST_BUILD_PATH = 'c:/boost/tools/build'
 BOOST_ROOT = 'c:/boost'
-BOOST_VERSION = "1.81.0"
+BOOST_VERSION = "1.83.0"
 PATH = 'c:/boost;$PATH'
 
 [tool.isort]