From edbfb3c6d0596fa1e0f956f623e246eb54d07900 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 21 Feb 2022 12:32:29 +1100 Subject: [PATCH] Added PyPy3.8 --- .github/workflows/wheels.yml | 4 ++-- config.sh | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3e57bcdac..6b9e2df84 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-20.04", "macos-latest" ] - python: [ "pypy3.7-7.3.7", "3.7", "3.8", "3.9", "3.10" ] + python: [ "pypy3.7-7.3.8", "pypy3.8-7.3.8", "3.7", "3.8", "3.9", "3.10" ] platform: [ "x86_64", "i686" ] macos-target: [ "10.10" ] exclude: @@ -75,7 +75,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-20.04", "macos-latest" ] - python: [ "pypy3.7-7.3.7", "3.7", "3.8", "3.9", "3.10" ] + python: [ "pypy3.7-7.3.8", "pypy3.8-7.3.8", "3.7", "3.8", "3.9", "3.10" ] platform: [ "x86_64", "i686" ] macos-target: [ "10.10" ] exclude: diff --git a/config.sh b/config.sh index a527ac9ae..5d132d1a7 100644 --- a/config.sh +++ b/config.sh @@ -165,9 +165,7 @@ function run_tests { brew install openblas echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg fi - if [[ "$MB_PYTHON_VERSION" == pypy3.7-* ]] && [[ $(uname -m) == "i686" ]]; then - python3 -m pip install numpy==1.20.3 - elif [[ "$MB_PYTHON_VERSION" == 3.10 ]] && [[ $(uname -m) == "i686" ]]; then + if [[ "$MB_PYTHON_VERSION" == pypy3.* || "$MB_PYTHON_VERSION" == 3.10 ]] && [[ $(uname -m) == "i686" ]]; then python3 -m pip install numpy==1.21.4 elif [[ "$MB_PYTHON_VERSION" == 3.8 || "$MB_PYTHON_VERSION" == 3.9 ]] && [[ $(uname -m) == "i686" ]]; then python3 -m pip install numpy==1.21.5