From 51d46952e960f393a59977dfb5570c770cdc7592 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 2 Apr 2022 08:37:15 -0700
Subject: [PATCH] BLD: Bump cibuildwheel and enable more PyPy

---
 .github/workflows/wheels.yml | 25 ++++++++++---------------
 .travis.yml                  |  6 +++---
 pyproject.toml               |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d81d18648db5..76792e90844c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -75,21 +75,16 @@ jobs:
         - [macos-10.15, macosx_*]
         - [windows-2019, win_amd64]
         - [windows-2019, win32]
-        python: ["cp38", "cp39", "cp310"]
-        include:
-        # manylinux pypy builds
-        - buildplat: [ubuntu-20.04, manylinux_x86_64]
-          python: "pp38"
-
-        # TODO: Uncomment and bump cibuildwheel version
-        # once cibuildwheel adds PyPy 7.3.8
-        # macOS pypy builds
-        #- buildplat: [macos-10.15, macosx_x86_64]
-        #  python: "pp38"
-
-        # Windows PyPy builds
-        - buildplat: [windows-2019, win_amd64]
+        # TODO: uncomment PyPy 3.9 builds once PyPy
+        # re-releases a new minor version
+        # NOTE: This needs a bump of cibuildwheel version, also, once that happens.
+        python: ["cp38", "cp39", "cp310", "pp38"] #, "pp39"]
+        exclude:
+        # Don't build PyPy 32-bit windows
+        - buildplat: [windows-2019, win32]
           python: "pp38"
+        - buildplat: [windows-2019, win32]
+          python: "pp39"
     env:
       IS_32_BIT: ${{ matrix.buildplat[1] == 'win32' }}
       IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
@@ -120,7 +115,7 @@ jobs:
         if: ${{ env.IS_32_BIT == 'true' }}
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.4.0
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 
diff --git a/.travis.yml b/.travis.yml
index 4ee14ca75d8c..f7fedd822b82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ jobs:
       virt: vm
       env:
         - CIBW_BUILD: cp38-manylinux_aarch64
-      install: python3 -m pip install cibuildwheel==2.3.1
+      install: python3 -m pip install cibuildwheel==2.4.0
       script: |
         cibuildwheel --output-dir wheelhouse
         source ./tools/wheels/upload_wheels.sh
@@ -64,7 +64,7 @@ jobs:
       virt: vm
       env:
         - CIBW_BUILD: cp39-manylinux_aarch64
-      install: python3 -m pip install cibuildwheel==2.3.1
+      install: python3 -m pip install cibuildwheel==2.4.0
       script: |
         cibuildwheel --output-dir wheelhouse
         source ./tools/wheels/upload_wheels.sh
@@ -77,7 +77,7 @@ jobs:
       virt: vm
       env:
         - CIBW_BUILD: cp310-manylinux_aarch64
-      install: python3 -m pip install cibuildwheel==2.3.1
+      install: python3 -m pip install cibuildwheel==2.4.0
       script: |
         cibuildwheel --output-dir wheelhouse
         source ./tools/wheels/upload_wheels.sh
diff --git a/pyproject.toml b/pyproject.toml
index be8e665bf54a..5c909aebcf9f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,7 +77,7 @@ requires = [
 
 
 [tool.cibuildwheel]
-skip = "cp36-* cp37-* pp37-* pp38-macosx* *-manylinux_i686 *_ppc64le *_s390x *-musllinux*"
+skip = "cp36-* cp37-* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux*"
 build-verbosity = "3"
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
 before-test = "pip install -r {project}/test_requirements.txt"