Clean up NumPy dependencies in wheel CI

QuLogic · QuLogic · commit 052bec0ee280 · 2022-02-10T22:06:17.000-05:00
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -28,8 +28,6 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
-      min-numpy-version: "1.17.3"
-      min-numpy-hash: "b6/d6/be8f975f5322336f62371c9abeb936d592c98c047ad63035f1b38ae08efe"
       CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
     strategy:
       matrix:
@@ -55,35 +53,18 @@ jobs:
         with:
           python-version: '3.8'
 
-      - uses: actions/cache@v2
-        id: numpy-cache
-        with:
-          path: numpy-aarch64-cache/
-          key: numpy-${{ matrix.cibw_archs }}-cache-${{ env.min-numpy-version }}
-
       - name: Install cibuildwheel
         run: |
           python -m pip install cibuildwheel==2.1.1
 
-      - name: Build minimum NumPy for aarch64
-        if: matrix.cibw_archs == 'aarch64' && steps.numpy-cache.outputs.cache-hit != 'true'
-        run: |
-          wget https://files.pythonhosted.org/packages/${{ env.min-numpy-hash }}/numpy-${{ env.min-numpy-version }}.zip
-          unzip numpy-${{ env.min-numpy-version }}.zip
-          cd numpy-${{ env.min-numpy-version }}
-          python -m cibuildwheel --output-dir ../numpy-aarch64-cache
-        env:
-          CIBW_BUILD: "cp38-*"
-          CIBW_ARCHS: aarch64
-
       - name: Build wheels for CPython 3.10
         run: |
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.21.3
+          CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
@@ -94,18 +75,18 @@ jobs:
           CIBW_BUILD: "cp39-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.3
+          CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython
+      - name: Build wheels for CPython 3.8
         run: |
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "cp38-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
+          CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.2
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
@@ -114,7 +95,7 @@ jobs:
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "pp38-*"
-          CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
+          CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           PIP_USE_FEATURE: in-tree-build
         if: matrix.cibw_archs != 'aarch64'
