more backports

Author: reaperhulk

.github/workflows/wheel-builder.yml

@@ -214,11 +214,6 @@ jobs:
             # This will change in the future as we change the base Python we
             # build against
             _PYTHON_HOST_PLATFORM: 'macosx-10.9-universal2'
-          - VERSION: 'pypy-3.10'
-            BIN_PATH: 'pypy3'
-            DEPLOYMENT_TARGET: '10.13'
-            _PYTHON_HOST_PLATFORM: 'macosx-10.9-x86_64'
-            ARCHFLAGS: '-arch x86_64'
           - VERSION: 'pypy-3.11'
             BIN_PATH: 'pypy3'
             DEPLOYMENT_TARGET: '11.0'
@@ -325,18 +320,10 @@ jobs:
           - {VERSION: "3.11", "ABI_VERSION": "py38"}
           - {VERSION: "3.11", "ABI_VERSION": "py311"}
           - {VERSION: "3.14t"}
-          - {VERSION: "pypy-3.10"}
           - {VERSION: "pypy-3.11"}
         exclude:
           # We need to exclude the below configuration because there is no 32-bit pypy3
           - WINDOWS: {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
-            PYTHON: {VERSION: "pypy-3.10"}
-          - WINDOWS: {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
-            PYTHON: {VERSION: "pypy-3.11"}
-          # We need to exclude the below configuration because there is no ARM64 pypy3
-          - WINDOWS: {ARCH: 'arm64', WINDOWS: 'arm64', RUST_TRIPLE: 'aarch64-pc-windows-msvc', RUNNER: 'windows-11-arm'}
-            PYTHON: {VERSION: "pypy-3.10"}
-          - WINDOWS: {ARCH: 'arm64', WINDOWS: 'arm64', RUST_TRIPLE: 'aarch64-pc-windows-msvc', RUNNER: 'windows-11-arm'}
             PYTHON: {VERSION: "pypy-3.11"}
     name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.WINDOWS.WINDOWS }} ${{ matrix.PYTHON.ABI_VERSION }}"
     steps: