Merge pull request #26125 from QuLogic/fewer-wheels

ksunden · web-flow · commit 7d12885394d3 · 2023-06-15T15:48:12.000-05:00
Stop building universal2 and win32 wheels
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -107,7 +107,7 @@ jobs:
         python {package}/ci/check_version_number.py
       # Apple Silicon machines are not available for testing, so silence the
       # warning from cibuildwheel. Remove the skip when they're available.
-      CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"
+      CIBW_TEST_SKIP: "*-macosx_arm64"
       MACOSX_DEPLOYMENT_TARGET: "10.12"
       MPL_DISABLE_FH4: "yes"
     strategy:
@@ -118,9 +118,9 @@ jobs:
           - os: ubuntu-20.04
             cibw_archs: "aarch64"
           - os: windows-latest
-            cibw_archs: "auto"
+            cibw_archs: "auto64"
           - os: macos-11
-            cibw_archs: "x86_64 universal2 arm64"
+            cibw_archs: "x86_64 arm64"
 
     steps:
       - name: Set up QEMU
diff --git a/doc/api/next_api_changes/development/25475-ES.rst b/doc/api/next_api_changes/development/25475-ES.rst
@@ -1,5 +1,9 @@
-Wheels for 32-bit Linux are no longer distributed
+Wheels for some systems are no longer distributed
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Pre-compiled wheels for 32-bit Linux are no longer provided on PyPI since
-Matplotlib 3.8.
+Pre-compiled wheels for 32-bit Linux and Windows are no longer provided on PyPI
+since Matplotlib 3.8.
+
+Multi-architecture ``universal2`` wheels for macOS are no longer provided on PyPI since
+Matplotlib 3.8. In general, ``pip`` will always prefer the architecture-specific
+(``amd64``- or ``arm64``-only) wheels, so these provided little benefit.
