From f2665f573f34af4b1b74e174734ecf0f98cd2e00 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 17 Sep 2023 21:21:08 +1000 Subject: [PATCH 1/3] NumPy now supports Python 3.12 --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index ee6ffa68871..a5daa43e4ff 100644 --- a/config.sh +++ b/config.sh @@ -154,7 +154,7 @@ function run_tests { apt-get update apt-get install -y curl libfribidi0 unzip fi - if [ -z "$IS_ALPINE" ] && [[ "$MB_PYTHON_VERSION" != 3.12 ]]; then + if [ -z "$IS_ALPINE" ]; then python3 -m pip install numpy fi python3 -m pip install defusedxml olefile pyroma From 7a0023d8406b63b83b2b4b9e1644e9306b8321fd Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 18 Sep 2023 15:36:01 +1000 Subject: [PATCH 2/3] Install libopenblas-dev and pkg-config to fix NumPy install on Linux PyPy 3.10 --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index a5daa43e4ff..c5651890c62 100644 --- a/config.sh +++ b/config.sh @@ -152,7 +152,7 @@ function run_tests { apk add curl fribidi else apt-get update - apt-get install -y curl libfribidi0 unzip + apt-get install -y curl libfribidi0 libopenblas-dev pkg-config unzip fi if [ -z "$IS_ALPINE" ]; then python3 -m pip install numpy From a518f3c21f1db7adee32976c3afec5f680948ab9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 18 Sep 2023 22:42:05 +1000 Subject: [PATCH 3/3] Fixed openblas detection on macOS for PyPy 3.10 --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index c5651890c62..15b47885940 100644 --- a/config.sh +++ b/config.sh @@ -148,6 +148,7 @@ EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux function run_tests { if [ -n "$IS_MACOS" ]; then brew install fribidi + export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig" elif [ -n "$IS_ALPINE" ]; then apk add curl fribidi else