From 7d74e7c0c0d547e775ca753e692d79f07e239634 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 9 May 2022 21:53:41 +1000 Subject: [PATCH 1/2] Updated NumPy to latest 1.21 on 32-bit --- config.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config.sh b/config.sh index 37cafc1ec..388f41212 100644 --- a/config.sh +++ b/config.sh @@ -162,10 +162,8 @@ function run_tests { else apt-get install libfribidi0 fi - 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 + if [[ "$MB_PYTHON_VERSION" != 3.7 ]] && [[ $(uname -m) == "i686" ]]; then + python3 -m pip install numpy==1.21 elif [ -z "$IS_ALPINE" ]; then python3 -m pip install numpy fi From 473715441552ba5c3b6a96ea3b403587a8613330 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 9 May 2022 21:53:21 +1000 Subject: [PATCH 2/2] Simplified logic since NumPy 1.22 dropped support for Python 3.7 --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 388f41212..4d83786d9 100644 --- a/config.sh +++ b/config.sh @@ -162,7 +162,7 @@ function run_tests { else apt-get install libfribidi0 fi - if [[ "$MB_PYTHON_VERSION" != 3.7 ]] && [[ $(uname -m) == "i686" ]]; then + if [[ $(uname -m) == "i686" ]]; then python3 -m pip install numpy==1.21 elif [ -z "$IS_ALPINE" ]; then python3 -m pip install numpy