From 1d0fc0c0ae7aa95efa4239bc83f9f97391946cf5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 15 Mar 2023 20:16:47 -0400 Subject: [PATCH] Stop building 32-bit Linux wheels Also, simplify workflow file to remove some duplication. --- .github/workflows/cibuildwheel.yml | 42 ++++++------------- .../next_api_changes/development/25475-ES.rst | 5 +++ 2 files changed, 18 insertions(+), 29 deletions(-) create mode 100644 doc/api/next_api_changes/development/25475-ES.rst diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index f7024f98f61c..ae2649437bc3 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -35,20 +35,29 @@ jobs: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} env: - CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - MACOSX_DEPLOYMENT_TARGET: "10.12" + CIBW_BEFORE_BUILD: >- + pip install certifi oldest-supported-numpy && + git clean -fxd build CIBW_BEFORE_BUILD_WINDOWS: >- pip install certifi delvewheel oldest-supported-numpy && git clean -fxd build CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >- delvewheel repair -w {dest_dir} {wheel} + CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 + CIBW_SKIP: "*-musllinux*" + MACOSX_DEPLOYMENT_TARGET: "10.12" + MPL_DISABLE_FH4: "yes" strategy: matrix: - os: [ubuntu-20.04, windows-latest, macos-11] - cibw_archs: ["auto"] include: + - os: ubuntu-20.04 + cibw_archs: "x86_64" - os: ubuntu-20.04 cibw_archs: "aarch64" + - os: windows-latest + cibw_archs: "auto" + - os: macos-11 + cibw_archs: "x86_64 universal2 arm64" steps: - name: Set up QEMU @@ -73,49 +82,24 @@ jobs: uses: pypa/cibuildwheel@v2.12.1 env: CIBW_BUILD: "cp311-*" - CIBW_SKIP: "*-musllinux*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 - CIBW_BEFORE_BUILD: >- - pip install certifi oldest-supported-numpy && - git clean -fxd build - MPL_DISABLE_FH4: "yes" CIBW_ARCHS: ${{ matrix.cibw_archs }} - name: Build wheels for CPython 3.10 uses: pypa/cibuildwheel@v2.12.1 env: CIBW_BUILD: "cp310-*" - CIBW_SKIP: "*-musllinux*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 - CIBW_BEFORE_BUILD: >- - pip install certifi oldest-supported-numpy && - git clean -fxd build - MPL_DISABLE_FH4: "yes" CIBW_ARCHS: ${{ matrix.cibw_archs }} - name: Build wheels for CPython 3.9 uses: pypa/cibuildwheel@v2.12.1 env: CIBW_BUILD: "cp39-*" - CIBW_SKIP: "*-musllinux*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 - CIBW_BEFORE_BUILD: >- - pip install certifi oldest-supported-numpy && - git clean -fxd build - MPL_DISABLE_FH4: "yes" CIBW_ARCHS: ${{ matrix.cibw_archs }} - name: Build wheels for PyPy uses: pypa/cibuildwheel@v2.12.1 env: CIBW_BUILD: "pp39-*" - CIBW_SKIP: "*-musllinux*" - CIBW_BEFORE_BUILD: >- - pip install certifi oldest-supported-numpy && - git clean -fxd build CIBW_ARCHS: ${{ matrix.cibw_archs }} if: matrix.cibw_archs != 'aarch64' diff --git a/doc/api/next_api_changes/development/25475-ES.rst b/doc/api/next_api_changes/development/25475-ES.rst new file mode 100644 index 000000000000..a990f94a8f1a --- /dev/null +++ b/doc/api/next_api_changes/development/25475-ES.rst @@ -0,0 +1,5 @@ +Wheels for 32-bit Linux are no longer distributed +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Pre-compiled wheels for 32-bit Linux are no longer provided on PyPI since +Matplotlib 3.8.