From d07e45d7d8b68ab848e1f214e4d52ac20b066a7b Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 17 Sep 2023 21:46:04 +1000
Subject: [PATCH 1/4] NumPy now supports Python 3.12

---
 .ci/install.sh                     | 3 +--
 .github/workflows/macos-install.sh | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index d5cbd82488b..acec05eee9d 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -38,8 +38,7 @@ python3 -m pip install -U pytest-timeout
 python3 -m pip install pyroma
 
 if [[ $(uname) != CYGWIN* ]]; then
-    # TODO Remove condition when NumPy supports 3.12
-    if ! [ "$GHA_PYTHON_VERSION" == "3.12-dev" ]; then python3 -m pip install numpy ; fi
+    python3 -m pip install numpy
 
     # PyQt6 doesn't support PyPy3
     if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
index 1fc6262f4fe..dfd7d055302 100755
--- a/.github/workflows/macos-install.sh
+++ b/.github/workflows/macos-install.sh
@@ -13,8 +13,7 @@ python3 -m pip install -U pytest-cov
 python3 -m pip install -U pytest-timeout
 python3 -m pip install pyroma
 
-# TODO Remove condition when NumPy supports 3.12
-if ! [ "$GHA_PYTHON_VERSION" == "3.12-dev" ]; then python3 -m pip install numpy ; fi
+python3 -m pip install numpy
 
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd

From 390e4a736077004aa469191b6f49a43ab7008d3d Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 17 Sep 2023 22:40:42 +1000
Subject: [PATCH 2/4] Install libopenblas-dev to fix installing NumPy on Linux
 PyPy 3.10

---
 .ci/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index acec05eee9d..4748feb3d49 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -23,7 +23,7 @@ if [[ $(uname) != CYGWIN* ]]; then
     sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\
                              ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\
                              cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
-                             sway wl-clipboard
+                             sway wl-clipboard libopenblas-dev
 fi
 
 python3 -m pip install --upgrade pip

From 43bae2b101b3000c49a5385162aa4022aa6c651c Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 18 Sep 2023 22:31:50 +1000
Subject: [PATCH 3/4] Fixed openblas detection on macOS

---
 .github/workflows/macos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
index dfd7d055302..a20838a1507 100755
--- a/.github/workflows/macos-install.sh
+++ b/.github/workflows/macos-install.sh
@@ -3,6 +3,7 @@
 set -e
 
 brew install libtiff libjpeg openjpeg libimagequant webp little-cms2 freetype libraqm
+export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
 
 PYTHONOPTIMIZE=0 python3 -m pip install cffi
 python3 -m pip install coverage

From bf046dff6e75103d6718c33353ae5fbef25fcd20 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:17:47 +1000
Subject: [PATCH 4/4] Limit NumPy version on Cygwin

---
 .github/workflows/test-cygwin.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 949da636069..5071e5bd442 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -102,10 +102,10 @@ jobs:
         run: |
           bash.exe .ci/install.sh
 
-      - name: Install latest NumPy
+      - name: Upgrade NumPy
         shell: dash.exe -l "{0}"
         run: |
-          python3 -m pip install -U numpy
+          python3 -m pip install -U "numpy<1.26"
 
       - name: Build
         shell: bash.exe -eo pipefail -o igncr "{0}"