Merge pull request #113 from spotify/psobot/bump-build-reqs

Fix master build failures due to universal2 issues on macos-latest.
spotify · Jul 10, 2022 · e5bc309 · e5bc309
2 parents 206fd3a + 1058212
commit e5bc309
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 16 deletions.
diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
@@ -59,8 +59,9 @@ jobs:
       MINIMUM_COVERAGE_PERCENTAGE: 89
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-18.04, ubuntu-latest, windows-latest, macos-10.15, macos-latest]
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
+        # TODO: Switch back to macos-latest once https://github.com/actions/python-versions/pull/114 is fixed
+        os: [ubuntu-18.04, ubuntu-latest, windows-latest, macos-10.15]
     name: Test with Python ${{ matrix.python-version }} on ${{ matrix.os }}
     steps:
       - name: Set up Python ${{ matrix.python-version }}
@@ -175,37 +176,58 @@ jobs:
     strategy:
       matrix:
         include:
-        - { os: macos-latest, build: cp36-macosx_x86_64 }
-        - { os: macos-latest, build: cp37-macosx_x86_64 }
-        - { os: macos-latest, build: cp38-macosx_x86_64 }
-        - { os: macos-latest, build: cp39-macosx_x86_64 }
-        - { os: macos-latest, build: cp310-macosx_x86_64 }
-        - { os: macos-latest, build: cp38-macosx_universal2 }
-        - { os: macos-latest, build: cp39-macosx_universal2 }
-        - { os: macos-latest, build: cp310-macosx_universal2 }
-        - { os: macos-latest, build: pp37-macosx_x86_64 }
-        - { os: macos-latest, build: pp38-macosx_x86_64 }
+        - { os: macos-10.15, build: cp36-macosx_x86_64 }
+        - { os: macos-10.15, build: cp37-macosx_x86_64 }
+        - { os: macos-10.15, build: cp38-macosx_x86_64 }
+        - { os: macos-10.15, build: cp39-macosx_x86_64 }
+        - { os: macos-10.15, build: cp310-macosx_x86_64 }
+        - { os: macos-10.15, build: cp311-macosx_x86_64 }
+        - { os: macos-10.15, build: cp38-macosx_universal2 }
+        - { os: macos-10.15, build: cp39-macosx_universal2 }
+        - { os: macos-10.15, build: cp310-macosx_universal2 }
+        - { os: macos-10.15, build: cp311-macosx_universal2 }
+        - { os: macos-10.15, build: pp37-macosx_x86_64 }
+        - { os: macos-10.15, build: pp38-macosx_x86_64 }
+        - { os: macos-10.15, build: pp39-macosx_x86_64 }
         - { os: windows-latest, build: cp36-win_amd64 }
         - { os: windows-latest, build: cp37-win_amd64 }
         - { os: windows-latest, build: cp38-win_amd64 }
         - { os: windows-latest, build: cp39-win_amd64 }
         - { os: windows-latest, build: cp310-win_amd64 }
+        - { os: windows-latest, build: cp311-win_amd64 }
         - { os: windows-latest, build: pp37-win_amd64 }
         - { os: windows-latest, build: pp38-win_amd64 }
+        - { os: windows-latest, build: pp39-win_amd64 }
         - { os: ubuntu-latest, build: cp36-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: cp36-musllinux_x86_64 }
         - { os: ubuntu-latest, build: cp36-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: cp36-musllinux_aarch64 }
         - { os: ubuntu-latest, build: cp37-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: cp37-musllinux_x86_64 }
         - { os: ubuntu-latest, build: cp37-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: cp37-musllinux_aarch64 }
         - { os: ubuntu-latest, build: cp38-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: cp38-musllinux_x86_64 }
         - { os: ubuntu-latest, build: cp38-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: cp38-musllinux_aarch64 }
         - { os: ubuntu-latest, build: cp39-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: cp39-musllinux_x86_64 }
         - { os: ubuntu-latest, build: cp39-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: cp39-musllinux_aarch64 }
         - { os: ubuntu-latest, build: cp310-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: cp310-musllinux_x86_64 }
         - { os: ubuntu-latest, build: cp310-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: cp310-musllinux_aarch64 }
+        - { os: ubuntu-latest, build: cp311-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: cp311-musllinux_x86_64 }
+        - { os: ubuntu-latest, build: cp311-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: cp311-musllinux_aarch64 }
         - { os: ubuntu-latest, build: pp37-manylinux_x86_64 }
         - { os: ubuntu-latest, build: pp37-manylinux_aarch64 }
         - { os: ubuntu-latest, build: pp38-manylinux_x86_64 }
         - { os: ubuntu-latest, build: pp38-manylinux_aarch64 }
+        - { os: ubuntu-latest, build: pp39-manylinux_x86_64 }
+        - { os: ubuntu-latest, build: pp39-manylinux_aarch64 }
     name: Build wheel for ${{ matrix.build }}
     steps:
       - uses: actions/checkout@v2

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,8 @@
 [build-system]
 requires = [
-    "setuptools>=42",
-    "wheel",
-    "pybind11>=2.6.0",
+    "setuptools>=63",
+    "wheel>=0.36.2",
+    "pybind11>=2.9.2",
 ]
 
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"