From fbe4dce4c81899b0f3ebaf2ec21d7562234e67a9 Mon Sep 17 00:00:00 2001 From: Leo Singer Date: Wed, 7 Sep 2022 12:22:26 +0200 Subject: [PATCH] Narrow workaround for numpy/numpy#16468 --- .github/workflows/cibuildwheel.yml | 3 ++- pyproject.toml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index f983bf1..cc2715e 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -41,7 +41,8 @@ jobs: env: CIBW_ENVIRONMENT_MACOS: F77=gfortran-9 F90=gfortran-9 # Skip musllinux wheels, which take a long time to build because Numpy must be built from source - CIBW_SKIP: '*musllinux*' + # Skip pp37-win_* and pp37-macosx_*, because there were never Numpy wheels built for them + CIBW_SKIP: '*musllinux* pp37-win_* pp37-macosx_*' - uses: actions/upload-artifact@v3 with: diff --git a/pyproject.toml b/pyproject.toml index 22e94ec..7fccb6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,8 @@ requires = ["setuptools", "wheel", - # Require numpy>=1.20.3 on Windows due to https://github.com/numpy/numpy/pull/16468 - "oldest-supported-numpy; python_version>='3.10' or platform_system!='Windows'", - "numpy==1.20.3; python_version<'3.10' and platform_system=='Windows'"] + # see https://github.com/scipy/oldest-supported-numpy/issues/62 + "numpy==1.19.0; python_version<='3.8' and platform_system=='Windows' and platform_python_implementation != 'PyPy'", + "oldest-supported-numpy; python_version>'3.8' or platform_system!='Windows' or platform_python_implementation == 'PyPy'"] build-backend = 'setuptools.build_meta'