ci: Build py313 wheels, simplify build matrix

Author: mborgerson

.github/workflows/build.yml

@@ -40,26 +40,17 @@ jobs:
 
   build_wheels:
     needs: build_sdist
-    name: Build wheel ${{ matrix.wheel }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Build wheel ${{ matrix.py }}-${{ matrix.platform.wheel_tag }} on ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
-        include:
-          - { arch: arm64,    wheel: cp310-macosx_arm64,      os: macos-latest     }
-          - { arch: x86_64,   wheel: cp310-macosx_x86_64,     os: macos-13         }
-          - { arch: x86_64,   wheel: cp310-manylinux_x86_64,  os: ubuntu-latest    }
-          - { arch: aarch64,  wheel: cp310-manylinux_aarch64, os: ubuntu-24.04-arm }
-          - { arch: x86_64,   wheel: cp310-win_amd64,         os: windows-2019     }
-          - { arch: arm64,    wheel: cp311-macosx_arm64,      os: macos-latest     }
-          - { arch: x86_64,   wheel: cp311-macosx_x86_64,     os: macos-13         }
-          - { arch: x86_64,   wheel: cp311-manylinux_x86_64,  os: ubuntu-latest    }
-          - { arch: aarch64,  wheel: cp311-manylinux_aarch64, os: ubuntu-24.04-arm }
-          - { arch: x86_64,   wheel: cp311-win_amd64,         os: windows-2019     }
-          - { arch: arm64,    wheel: cp312-macosx_arm64,      os: macos-latest     }
-          - { arch: x86_64,   wheel: cp312-macosx_x86_64,     os: macos-13         }
-          - { arch: x86_64,   wheel: cp312-manylinux_x86_64,  os: ubuntu-latest    }
-          - { arch: aarch64,  wheel: cp312-manylinux_aarch64, os: ubuntu-24.04-arm }
-          - { arch: x86_64,   wheel: cp312-win_amd64,         os: windows-2019     }
+        py: [cp310, cp311, cp312, cp313]
+        platform:
+          - { arch: x86_64,  os: windows-2019,     wheel_tag: win_amd64         }
+          - { arch: x86_64,  os: macos-13,         wheel_tag: macosx_x86_64     }
+          - { arch: arm64,   os: macos-latest,     wheel_tag: macosx_arm64      }
+          - { arch: x86_64,  os: ubuntu-latest,    wheel_tag: manylinux_x86_64  }
+          - { arch: aarch64, os: ubuntu-24.04-arm, wheel_tag: manylinux_aarch64 }
     steps:
       - name: Download source distribution
         uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
@@ -73,14 +64,14 @@ jobs:
         with:
           output-dir: wheelhouse
         env:
-          CIBW_ARCHS_MACOS: ${{ matrix.arch }}
-          CIBW_BUILD: ${{ matrix.wheel }}
+          CIBW_ARCHS_MACOS: ${{ matrix.platform.arch }}
+          CIBW_BUILD: ${{ matrix.py }}-${{ matrix.platform.wheel_tag }}
           CIBW_TEST_COMMAND: python -m unittest discover -v -s {package}/tests
           CIBW_BUILD_VERBOSITY: 1
-          MACOSX_DEPLOYMENT_TARGET: ${{ matrix.arch == 'arm64' && '11' || '10.14' }}
+          MACOSX_DEPLOYMENT_TARGET: ${{ matrix.platform.arch == 'arm64' && '11' || '10.14' }}
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: ${{ matrix.wheel }}
+          name: ${{ matrix.py }}-${{ matrix.platform.wheel_tag }}
           path: ./wheelhouse/*.whl
 
   build_docs: