From e3cb66a1f6d994288036026f42db63d1e70d9206 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 29 May 2023 16:16:41 +0200
Subject: [PATCH 01/29] BLD: default to using meson-python as build backend

---
 meson.build                    |   2 +-
 numpy/tests/test_public_api.py |   4 -
 pyproject.toml                 | 137 ++++++++++++++++-----------------
 3 files changed, 66 insertions(+), 77 deletions(-)

diff --git a/meson.build b/meson.build
index be0f2985c03d..e193907f42f4 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
   # Note that the git commit hash cannot be added dynamically here
   # It is dynamically added upon import by versioneer
   # See `numpy/__init__.py`
-  version: '1.24.0.dev0',
+  version: '2.0.0.dev0',
   license: 'BSD-3',
   meson_version: '>= 1.1.0',
   default_options: [
diff --git a/numpy/tests/test_public_api.py b/numpy/tests/test_public_api.py
index 9772bf86b8da..27619ba3bd95 100644
--- a/numpy/tests/test_public_api.py
+++ b/numpy/tests/test_public_api.py
@@ -472,10 +472,6 @@ def check_importable(module_name):
                              "{}".format(module_names))
 
 
-@pytest.mark.xfail(
-    hasattr(np.__config__, "_built_with_meson"),
-    reason = "Meson does not yet support entry points via pyproject.toml",
-)
 @pytest.mark.xfail(
     sysconfig.get_config_var("Py_DEBUG") is not None,
     reason=(
diff --git a/pyproject.toml b/pyproject.toml
index 23e7288e724f..070170d8ef4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,79 +1,72 @@
 [build-system]
-# Uncomment this line, the `meson-python` requires line, and the [project] and
-# [project.urls] tables below in order to build with Meson by default
-#build-backend = "mesonpy"
+build-backend = "mesonpy"
 requires = [
-    # setuptools, wheel and Cython are needed for the setup.py based build
-    "setuptools==59.2.0",
-    # `wheel` is needed for non-isolated builds, given that `meson-python`
-    # doesn't list it as a runtime requirement (at least in 0.11.0) - it's
-    # likely to be removed as a dependency in meson-python 0.12.0.
-    "wheel==0.38.1",
-    "Cython>=0.29.34,<3.0",
-#    "meson-python>=0.10.0",
+    "Cython>=0.29.34",
+    "meson-python>=0.13.1",
 ]
 
-#[project]
-#name = "numpy"
-#
-## Using https://peps.python.org/pep-0639/
-## which is still in draft
-#license = {text = "BSD-3-Clause"}
-## Note: needed for Meson, but setuptools errors on it. Uncomment once Meson is default.
-##license-files.paths = [
-##    "LICENSE.txt",
-##    "LICENSES_bundles.txt"
-##]
-#
-#description = "Fundamental package for array computing in Python"
-#authors = [{name = "Travis E. Oliphant et al."}]
-#maintainers = [
-#    {name = "NumPy Developers", email="numpy-discussion@python.org"},
-#]
-#requires-python = ">=3.9"
-#readme = "README.md"
-#classifiers = [
-#    'Development Status :: 5 - Production/Stable',
-#    'Intended Audience :: Science/Research',
-#    'Intended Audience :: Developers',
-#    'License :: OSI Approved :: BSD License',
-#    'Programming Language :: C',
-#    'Programming Language :: Python',
-#    'Programming Language :: Python :: 3',
-#    'Programming Language :: Python :: 3.9',
-#    'Programming Language :: Python :: 3.10',
-#    'Programming Language :: Python :: 3.11',
-#    'Programming Language :: Python :: 3 :: Only',
-#    'Programming Language :: Python :: Implementation :: CPython',
-#    'Topic :: Software Development',
-#    'Topic :: Scientific/Engineering',
-#    'Typing :: Typed',
-#    'Operating System :: Microsoft :: Windows',
-#    'Operating System :: POSIX',
-#    'Operating System :: Unix',
-#    'Operating System :: MacOS',
-#]
-#dynamic = ["version", "scripts"]
-#
-#[project.scripts]
-## Note: this is currently dynamic, see setup.py. Can we get rid of that?
-##       see commit f22a33b71 for rationale for dynamic behavior
-#'f2py = numpy.f2py.f2py2e:main'
-#'f2py3 = numpy.f2py.f2py2e:main'
-#'f2py3.MINOR_VERSION = numpy.f2py.f2py2e:main'
-#
-# When enabling this stanza, make sure to remove the meson-specific xfail from
-# numpy/tests/test_public_api.py
-#[project.entry-points]
-#'array_api': 'numpy = numpy.array_api'
-#'pyinstaller40': 'hook-dirs = numpy:_pyinstaller_hooks_dir'
-#
-#[project.urls]
-#homepage = "https://numpy.org"
-#documentation = "https://numpy.org/doc/"
-#source = "https://github.com/numpy/numpy"
-#download = "https://pypi.org/project/numpy/#files"
-#tracker = "https://github.com/numpy/numpy/issues"
+[project]
+name = "numpy"
+version = "2.0.0.dev0"
+
+# Using https://peps.python.org/pep-0639/ which is still in draft
+license = {text = "BSD-3-Clause"}
+license-files.paths = [
+    "LICENSE.txt",
+    "LICENSES_bundles.txt"
+]
+
+description = "Fundamental package for array computing in Python"
+authors = [{name = "Travis E. Oliphant et al."}]
+maintainers = [
+    {name = "NumPy Developers", email="numpy-discussion@python.org"},
+]
+requires-python = ">=3.9"
+readme = "README.md"
+classifiers = [
+    'Development Status :: 5 - Production/Stable',
+    'Intended Audience :: Science/Research',
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: BSD License',
+    'Programming Language :: C',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3 :: Only',
+    'Programming Language :: Python :: Implementation :: CPython',
+    'Topic :: Software Development',
+    'Topic :: Scientific/Engineering',
+    'Typing :: Typed',
+    'Operating System :: Microsoft :: Windows',
+    'Operating System :: POSIX',
+    'Operating System :: Unix',
+    'Operating System :: MacOS',
+]
+#dynamic = ["scripts"]
+
+[project.scripts]
+# TODO: this is currently dynamic for minor version support. See also the same
+# thing in setup.py. Can we get rid of that? see commit f22a33b71 for rationale
+# for dynamic behavior.
+f2py = 'numpy.f2py.f2py2e:main'
+f2py3 = 'numpy.f2py.f2py2e:main'
+#f2py3.MINOR_VERSION = 'numpy.f2py.f2py2e:main'
+
+[project.entry-points.array_api]
+numpy = 'numpy.array_api'
+
+[project.entry-points.pyinstaller40]
+hook-dirs = 'numpy:_pyinstaller_hooks_dir'
+
+[project.urls]
+homepage = "https://numpy.org"
+documentation = "https://numpy.org/doc/"
+source = "https://github.com/numpy/numpy"
+download = "https://pypi.org/project/numpy/#files"
+tracker = "https://github.com/numpy/numpy/issues"
 
 [tool.towncrier]
     # Do no set this since it is hard to import numpy inside the source directory

From ea1bd89fb24bb9ae5c9e490edeffeb2c66b65904 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 29 May 2023 16:23:41 +0200
Subject: [PATCH 02/29] CI: tweak CI for the change to meson-python as default
 build backend

---
 .circleci/config.yml             | 1 -
 .github/workflows/build_test.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5bd44798965..b8b5f0ae90d7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,7 +61,6 @@ jobs:
           name: build numpy
           command: |
             . venv/bin/activate
-            pip install --progress-bar=off --upgrade pip 'setuptools<49.2.0'
             pip install --progress-bar=off -r test_requirements.txt
             pip install --progress-bar=off -r doc_requirements.txt
             pip install .
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 71f683d68bd7..7e6d4811b510 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -436,7 +436,7 @@ jobs:
       run: |
         export CC=/usr/bin/gcc-12
         export CXX=/usr/bin/g++-12
-        python -m pip install -e .
+        python setup.py develop
     - name: Show config
       run: |
         python -c "import numpy as np; np.show_config()"

From f7c55aa3303d5ee63932de00df927efc8a654281 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 29 May 2023 18:11:09 +0200
Subject: [PATCH 03/29] CI: drop 32-bit Windows Azure testing, adjust 64-bit
 for Meson

Closes gh-23717
---
 azure-pipelines.yml     | 13 +------------
 azure-steps-windows.yml | 30 +++++++-----------------------
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e99ee10023ae..4d1be81bc984 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -249,30 +249,19 @@ stages:
     pool:
       vmImage: 'windows-2019'
     strategy:
-      maxParallel: 5
+      maxParallel: 3
       matrix:
-          Python39-32bit-full:
-            PYTHON_VERSION: '3.9'
-            PYTHON_ARCH: 'x86'
-            TEST_MODE: full
-            BITS: 32
           Python310-64bit-fast:
             PYTHON_VERSION: '3.10'
             PYTHON_ARCH: 'x64'
             TEST_MODE: fast
             BITS: 64
-          Python311-32bit-fast:
-            PYTHON_VERSION: '3.11'
-            PYTHON_ARCH: 'x86'
-            TEST_MODE: fast
-            BITS: 32
           Python311-64bit-full:
             PYTHON_VERSION: '3.11'
             PYTHON_ARCH: 'x64'
             TEST_MODE: full
             BITS: 64
             NPY_USE_BLAS_ILP64: '1'
-
           PyPy39-64bit-fast:
             PYTHON_VERSION: 'pypy3.9'
             PYTHON_ARCH: 'x64'
diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index a5404425cc12..b836adf8a3e4 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -37,26 +37,14 @@ steps:
 
 - powershell: |
     ls openblas
-    If ($(BITS) -eq 32) {
-        $env:CFLAGS = "-m32"
-        $env:LDFLAGS = "-m32"
-        $env:PATH = "$env:RTOOLS40_HOME\\mingw32\\bin;$env:PATH"
-    }
-    Else
-    {
-        $env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
-    }
+    $env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
     If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
         $env:OPENBLAS64_ = "openblas"
     } else {
         $env:OPENBLAS = "openblas"
     }
     python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
-    python -m pip wheel -v -v -v --no-build-isolation --no-use-pep517 --wheel-dir=dist .
-
-    ls dist -r | Foreach-Object {
-        python -m pip install $_.FullName
-    }
+    python -m pip install .
   displayName: 'Build NumPy'
 
 - script: |
@@ -65,16 +53,12 @@ steps:
   displayName: 'Check OpenBLAS version'
 
 - powershell: |
-    If ($(BITS) -eq 32) {
-        $env:CFLAGS = "-m32"
-        $env:LDFLAGS = "-m32"
-        $env:PATH = "$env:RTOOLS40_HOME\\mingw32\\bin;$env:PATH"
-    }
-    Else
-    {
-        $env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
+    $env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
+    If ( Test-Path env:TEST_MODE -eq full ) {
+      pytest --pyargs numpy -rsx --junitxml=junit/test-results.xml
+    } else {
+      pytest --pyargs numpy -m "not slow" -rsx --junitxml=junit/test-results.xml
     }
-    python runtests.py -n --show-build-log --mode=$(TEST_MODE) -- -rsx --junitxml=junit/test-results.xml
   displayName: 'Run NumPy Test Suite'
 
 - task: PublishTestResults@2

From 6c024e4aeb669075d1d1eec0143010fe0d1a75e2 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 29 May 2023 18:51:54 +0200
Subject: [PATCH 04/29] BLD: fix bug with CMake fallback detection of
 BLAS/LAPACK

---
 numpy/meson.build | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/numpy/meson.build b/numpy/meson.build
index 7b85d8e92f5b..ad1829a78db7 100644
--- a/numpy/meson.build
+++ b/numpy/meson.build
@@ -198,10 +198,13 @@ foreach name, dep : dependency_map
   if dep.found()
     conf_data.set(name + '_VERSION', dep.version())
     conf_data.set(name + '_TYPE_NAME', dep.type_name())
-    conf_data.set(name + '_INCLUDEDIR', dep.get_variable('includedir'))
-    conf_data.set(name + '_LIBDIR', dep.get_variable('libdir'))
-    conf_data.set(name + '_OPENBLAS_CONFIG', dep.get_variable('openblas_config'))
-    conf_data.set(name + '_PCFILEDIR', dep.get_variable('pcfiledir'))
+    if dep.type_name() == 'pkgconfig'
+      # CMake detection yields less info, so we need to leave it blank there
+      conf_data.set(name + '_INCLUDEDIR', dep.get_variable('includedir'))
+      conf_data.set(name + '_LIBDIR', dep.get_variable('libdir'))
+      conf_data.set(name + '_OPENBLAS_CONFIG', dep.get_variable('openblas_config'))
+      conf_data.set(name + '_PCFILEDIR', dep.get_variable('pcfiledir'))
+    endif
   endif
 endforeach
 

From 4917ebfdd8990e53aab33d8c80546f3615595e25 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 29 May 2023 19:07:24 +0200
Subject: [PATCH 05/29] CI: upgrade rtools to 4.3 to get a new enough GCC
 version in Azure

The rtools 4.0 used GCC 8.3 and we set the minimum to 8.3 for the Meson
build. That was to avoid workarounds for SIMD support for old GCCs,
and seems to still be a reasonable lower bound.
---
 azure-steps-windows.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index b836adf8a3e4..f82b0f3628a9 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -14,9 +14,10 @@ steps:
   displayName: 'Install dependencies; some are optional to avoid test skips'
 
 - powershell: |
-    # rtools 42+ does not support 32 bits builds.
-    choco install --confirm --no-progress --allow-downgrade rtools --version=4.0.0.20220206
-    echo "##vso[task.setvariable variable=RTOOLS40_HOME]c:\rtools40"
+    # Note that rtools 42+ does not support 32 bits builds. We dropped testing
+    # those, but if there's a need to go back on that, use version 4.0.0.20220206
+    choco install --confirm --no-progress --side-by-side rtools --version=4.3.5550
+    echo "##vso[task.setvariable variable=RTOOLS43_HOME]c:\rtools43"
   displayName: 'Install rtools'
 
 - powershell: |
@@ -32,12 +33,9 @@ steps:
     $env:OPENBLAS = $target
   displayName: 'Download / Install OpenBLAS'
 
-# NOTE: for Windows builds it seems much more tractable to use runtests.py
-# vs. manual setup.py and then runtests.py for testing only
-
 - powershell: |
     ls openblas
-    $env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
+    $env:PATH = "$env:RTOOLS43_HOME\\mingw64\\bin;$env:PATH"
     If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
         $env:OPENBLAS64_ = "openblas"
     } else {
@@ -53,7 +51,7 @@ steps:
   displayName: 'Check OpenBLAS version'
 
 - powershell: |
-    $env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
+    $env:PATH = "$env:RTOOLS43_HOME\\mingw64\\bin;$env:PATH"
     If ( Test-Path env:TEST_MODE -eq full ) {
       pytest --pyargs numpy -rsx --junitxml=junit/test-results.xml
     } else {

From 29dcb05688585603ce73efc190dd93ae411f8ee2 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 29 May 2023 19:15:29 +0200
Subject: [PATCH 06/29] CI: keep the Emscripten/Pyodide job on a setup.py-based
 build

---
 .github/workflows/emscripten.yml | 6 +++++-
 pyproject.toml.setuppy           | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pyproject.toml.setuppy

diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index a5983c8c1967..3b21364eca91 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -55,7 +55,11 @@ jobs:
         run: pip install pyodide-build==$PYODIDE_VERSION
 
       - name: Build
-        run: CFLAGS=-g2 LDFLAGS=-g2 pyodide build
+        run: |
+          # Pyodide is still in the process of adding better/easier support for
+          # non-setup.py based builds.
+          cp pyproject.toml.setuppy pyproject.toml
+          CFLAGS=-g2 LDFLAGS=-g2 pyodide build
 
       - name: set up node
         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
diff --git a/pyproject.toml.setuppy b/pyproject.toml.setuppy
new file mode 100644
index 000000000000..b28d93c8d529
--- /dev/null
+++ b/pyproject.toml.setuppy
@@ -0,0 +1,9 @@
+# pyproject.toml needed to build with setup.py
+# This file is used temporarily to replace the main pyproject.toml when needing
+# to avoid building with Meson (e.g., in the Emscripten/Pyodide CI job)
+[build-system]
+requires = [
+    "setuptools==59.2.0",
+    "wheel==0.38.1",
+    "Cython>=0.29.34,<3.0",
+]

From 618181dbf2242c00082cb823910a00933d140b3f Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Sun, 11 Jun 2023 16:11:34 +0300
Subject: [PATCH 07/29] use MSVC and force 64-bit OpenBLAS interfaces

---
 pyproject.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 070170d8ef4a..71c76fd58da6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -177,6 +177,11 @@ environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFL
 select = "*-win32"
 environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32" }
 
+[tool.meson-python.args]
+setup = ['--vsenv']
+# This should not be set on 32-bit builds...
+compile = ['-DBLAS_SYMBOL_SUFFIX=64_']
+
 [tool.spin]
 package = 'numpy'
 

From 9a806303492ee4aa82ad2f0b47b38cc3b1cbda9f Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Sun, 11 Jun 2023 16:28:35 +0300
Subject: [PATCH 08/29] drop rtools in wheel builds, do
 -DDBLAS_SYMBOL_SUFFIX=64_ differently

---
 .github/workflows/wheels.yml | 11 -----------
 pyproject.toml               |  8 +++-----
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d287b1e26b6b..d13c998f6c6c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -106,17 +106,6 @@ jobs:
         with:
           python-version: "3.x"
 
-      # We need rtools 4.0 to have 32 bit support on windows
-      - if: runner.os == 'windows'
-        uses: r-windows/install-rtools@ca1090c210479e995c03019a22b9798cdf57073a # main
-
-      - name: setup rtools for 32-bit
-        run: |
-          echo "PLAT=i686" >> $env:GITHUB_ENV
-          echo "PATH=c:\rtools40\mingw32\bin;$env:PATH" >> $env:GITHUB_ENV
-          gfortran --version
-        if: ${{ matrix.buildplat[1] == 'win32' }}
-
       - name: Build wheels
         uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1
         env:
diff --git a/pyproject.toml b/pyproject.toml
index 71c76fd58da6..e29a58f7b6d9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -157,7 +157,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
 
 [tool.cibuildwheel.macos]
 # For universal2 wheels, we will need to fuse them manually
@@ -168,10 +168,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing", LDFLAGS="-Wl,--strip-deb
 archs = "x86_64 arm64"
 test-skip = "*_universal2:arm64"
 # MACOS linker doesn't support stripping symbols
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="", LDFLAGS="" }
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
@@ -179,8 +179,6 @@ environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFL
 
 [tool.meson-python.args]
 setup = ['--vsenv']
-# This should not be set on 32-bit builds...
-compile = ['-DBLAS_SYMBOL_SUFFIX=64_']
 
 [tool.spin]
 package = 'numpy'

From 1462b62e366349923d70c39422ac1bec523773cf Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Sun, 11 Jun 2023 17:05:02 +0300
Subject: [PATCH 09/29] typo, install pkg-config on windows

---
 .github/workflows/wheels.yml | 5 +++++
 pyproject.toml               | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d13c998f6c6c..ff94fd9a1090 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -101,6 +101,11 @@ jobs:
           # https://github.com/actions/checkout/issues/338
           fetch-depth: 0
 
+      - name: pkg-config-for-win
+        run: |
+          choco install -y --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
+        if: runner.os == 'windows'
+
       # Used to push the built wheels
       - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4.6.1
         with:
diff --git a/pyproject.toml b/pyproject.toml
index e29a58f7b6d9..a5b11fe6e4e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -157,7 +157,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
 
 [tool.cibuildwheel.macos]
 # For universal2 wheels, we will need to fuse them manually
@@ -168,10 +168,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_"
 archs = "x86_64 arm64"
 test-skip = "*_universal2:arm64"
 # MACOS linker doesn't support stripping symbols
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"

From bebbde7715ec90a527fc4cb74a783baf5208fbb1 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Sun, 11 Jun 2023 22:18:57 +0300
Subject: [PATCH 10/29] set PKG_CONFIG_PATH for windows, add CXXFLAGS

---
 pyproject.toml                    | 6 +++---
 tools/wheels/cibw_before_build.sh | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a5b11fe6e4e2..7484a7210a79 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -157,7 +157,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="-Wl,--strip-debug", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux"}
 
 [tool.cibuildwheel.macos]
 # For universal2 wheels, we will need to fuse them manually
@@ -168,10 +168,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_",
 archs = "x86_64 arm64"
 test-skip = "*_universal2:arm64"
 # MACOS linker doesn't support stripping symbols
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
index 493cceeae4b1..99ff5a844546 100644
--- a/tools/wheels/cibw_before_build.sh
+++ b/tools/wheels/cibw_before_build.sh
@@ -38,6 +38,7 @@ elif [[ $RUNNER_OS == "Windows" ]]; then
         cp -r $target/$f openblas
     done
     ls openblas
+    echo "PKG_CONFIG_PATH=$PWD/openblas/lib/pkgconfig;" >> $env:GITHUB_ENV
 fi
 
 if [[ $RUNNER_OS == "macOS" ]]; then

From 80e0d70b51b939ee53e21e1216ac67ffda3dec87 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Sun, 11 Jun 2023 23:17:00 +0300
Subject: [PATCH 11/29] disable pypy builds, move PKG_CONFIG_PATH for windows

---
 .github/workflows/wheels.yml      | 3 ++-
 pyproject.toml                    | 4 ++--
 tools/wheels/cibw_before_build.sh | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ff94fd9a1090..ab3089826d16 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -79,7 +79,8 @@ jobs:
           - [macos-12, macosx_x86_64]
           - [windows-2019, win_amd64]
           - [windows-2019, win32]
-        python: ["cp39", "cp310", "cp311", "pp39"]
+        python: ["cp39", "cp310", "cp311"]
+        # python: ["cp39", "cp310", "cp311", "pp39"]
         exclude:
           # Don't build PyPy 32-bit windows
           - buildplat: [windows-2019, win32]
diff --git a/pyproject.toml b/pyproject.toml
index 7484a7210a79..e72ec97bbd01 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -171,11 +171,11 @@ test-skip = "*_universal2:arm64"
 environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
-environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32" }
+environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
 
 [tool.meson-python.args]
 setup = ['--vsenv']
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
index 99ff5a844546..0d76ec76538e 100644
--- a/tools/wheels/cibw_before_build.sh
+++ b/tools/wheels/cibw_before_build.sh
@@ -31,14 +31,12 @@ if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" ]] ; then
 elif [[ $RUNNER_OS == "Windows" ]]; then
     PYTHONPATH=tools python -c "import openblas_support; openblas_support.make_init('numpy')"
     target=$(python tools/openblas_support.py)
-    ls /tmp
     mkdir -p openblas
     # bash on windows does not like cp -r $target/* openblas
     for f in $(ls $target); do
         cp -r $target/$f openblas
     done
     ls openblas
-    echo "PKG_CONFIG_PATH=$PWD/openblas/lib/pkgconfig;" >> $env:GITHUB_ENV
 fi
 
 if [[ $RUNNER_OS == "macOS" ]]; then

From 89ffd5765b8f9d30f59bec68e706ca777c4e2478 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Mon, 12 Jun 2023 17:59:20 +0300
Subject: [PATCH 12/29] fixes from review, try a -O0 build

---
 numpy/core/tests/test_mem_policy.py | 5 +++--
 pyproject.toml                      | 4 +++-
 tools/wheels/cibw_test_command.sh   | 7 +------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/numpy/core/tests/test_mem_policy.py b/numpy/core/tests/test_mem_policy.py
index 479f702ea12f..b4e2f65916ca 100644
--- a/numpy/core/tests/test_mem_policy.py
+++ b/numpy/core/tests/test_mem_policy.py
@@ -377,10 +377,11 @@ def test_new_policy(get_module):
         #
         # if needed, debug this by
         # - running tests with -- -s (to not capture stdout/stderr
+        # - setting verbose=2
         # - setting extra_argv=['-vv'] here
-        assert np.core.test('full', verbose=2, extra_argv=['-vv'])
+        assert np.core.test('full', verbose=1, extra_argv=[])
         # also try the ma tests, the pickling test is quite tricky
-        assert np.ma.test('full', verbose=2, extra_argv=['-vv'])
+        assert np.ma.test('full', verbose=1, extra_argv=[])
 
     get_module.set_old_policy(orig_policy)
 
diff --git a/pyproject.toml b/pyproject.toml
index e72ec97bbd01..a9d85411788d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -172,13 +172,15 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -
 
 [tool.cibuildwheel.windows]
 environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
+config-settings = "setup-args=--vsenv"
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
 environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
 
 [tool.meson-python.args]
-setup = ['--vsenv']
+# These should be the defaults for a normal NumPy build
+setup = ['-Dbuildtype=custom','-Doptimization=0', '-Db_ndebug=true']
 
 [tool.spin]
 package = 'numpy'
diff --git a/tools/wheels/cibw_test_command.sh b/tools/wheels/cibw_test_command.sh
index 36c275f32d91..47a1a56e844f 100644
--- a/tools/wheels/cibw_test_command.sh
+++ b/tools/wheels/cibw_test_command.sh
@@ -26,10 +26,5 @@ fi
 # Set available memory value to avoid OOM problems on aarch64.
 # See gh-22418.
 export NPY_AVAILABLE_MEM="4 GB"
-if [[ $(python -c "import sys; print(sys.implementation.name)") == "pypy" ]]; then
-  # make PyPy more verbose, try to catch a segfault
-  python -c "import sys; import numpy; sys.exit(not numpy.test(label='full', verbose=2))"
-else
-  python -c "import sys; import numpy; sys.exit(not numpy.test(label='full'))"
-fi
+python -c "import sys; import numpy; sys.exit(not numpy.test(label='full'))"
 python $PROJECT_DIR/tools/wheels/check_license.py

From aef314b7cee6389f1003cbd9ddbd11d7d8e39875 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 12 Jun 2023 18:53:58 +0200
Subject: [PATCH 13/29] BLD: handle license files inclusion in wheels correctly

---
 pyproject.toml                | 9 ++-------
 tools/wheels/check_license.py | 8 ++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a9d85411788d..b2694735612f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,13 +8,8 @@ requires = [
 [project]
 name = "numpy"
 version = "2.0.0.dev0"
-
-# Using https://peps.python.org/pep-0639/ which is still in draft
-license = {text = "BSD-3-Clause"}
-license-files.paths = [
-    "LICENSE.txt",
-    "LICENSES_bundles.txt"
-]
+# TODO: add `license-files` once PEP 639 is accepted (see meson-python#88)
+license = {file = "LICENSE.txt"}
 
 description = "Fundamental package for array computing in Python"
 authors = [{name = "Travis E. Oliphant et al."}]
diff --git a/tools/wheels/check_license.py b/tools/wheels/check_license.py
index 8ced317d674c..a79a7c80dcc3 100644
--- a/tools/wheels/check_license.py
+++ b/tools/wheels/check_license.py
@@ -7,10 +7,10 @@
 distribution.
 
 """
-import os
 import sys
 import re
 import argparse
+import pathlib
 
 
 def check_text(text):
@@ -33,8 +33,12 @@ def main():
     __import__(args.module)
     mod = sys.modules[args.module]
 
+    # LICENSE.txt is installed in the .dist-info directory, so find ot tjere"
+    sitepkgs = pathlib.Path(mod.__file__).parent.parent
+    distinfo_path = [s for s in sitepkgs.glob("numpy-*.dist-info")][0]
+
     # Check license text
-    license_txt = os.path.join(os.path.dirname(mod.__file__), "LICENSE.txt")
+    license_txt = distinfo_path / "LICENSE.txt"
     with open(license_txt, encoding="utf-8") as f:
         text = f.read()
 

From 34933ac970d4f0ed57562c8759910ed575e6d0d3 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Tue, 13 Jun 2023 11:57:40 +0300
Subject: [PATCH 14/29] windows fixes, xfail test on manylinux2014

---
 azure-steps-windows.yml        | 4 +++-
 numpy/core/tests/test_umath.py | 4 ++++
 pyproject.toml                 | 4 ++--
 tools/wheels/check_license.py  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index f82b0f3628a9..758198e9d6ac 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -35,7 +35,9 @@ steps:
 
 - powershell: |
     ls openblas
-    $env:PATH = "$env:RTOOLS43_HOME\\mingw64\\bin;$env:PATH"
+    $env:PATH = "$env:RTOOLS43_HOME\\x86_64-w64-mingw32.static.posix\\bin;$env:PATH"
+    python -c"import os, pprint; pprint.pprint(os.environ['PATH'])"
+    gcc --version
     If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
         $env:OPENBLAS64_ = "openblas"
     } else {
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
index 9e3fe387b75e..b186bdb9cf16 100644
--- a/numpy/core/tests/test_umath.py
+++ b/numpy/core/tests/test_umath.py
@@ -4160,6 +4160,10 @@ def test_against_cmath(self):
                 b = cfunc(p)
                 assert_(abs(a - b) < atol, "%s %s: %s; cmath: %s" % (fname, p, a, b))
 
+    @pytest.mark.xfail(
+        _glibc_older_than("2.17"),
+        reason="Older glibc versions are imprecise (maybe passes with SIMD?)"
+    )
     @pytest.mark.xfail(IS_MUSL, reason="gh23049")
     @pytest.mark.xfail(IS_WASM, reason="doesn't work")
     @pytest.mark.parametrize('dtype', [np.complex64, np.complex_, np.longcomplex])
diff --git a/pyproject.toml b/pyproject.toml
index b2694735612f..91868d315ba3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -166,12 +166,12 @@ test-skip = "*_universal2:arm64"
 environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:/a/numpy/numpy/openblas/lib/pkgconfig;"}
 config-settings = "setup-args=--vsenv"
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
-environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
+environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:/a/numpy/numpy/openblas/lib/pkgconfig;"}
 
 [tool.meson-python.args]
 # These should be the defaults for a normal NumPy build
diff --git a/tools/wheels/check_license.py b/tools/wheels/check_license.py
index a79a7c80dcc3..7d0ef7921a4e 100644
--- a/tools/wheels/check_license.py
+++ b/tools/wheels/check_license.py
@@ -33,7 +33,7 @@ def main():
     __import__(args.module)
     mod = sys.modules[args.module]
 
-    # LICENSE.txt is installed in the .dist-info directory, so find ot tjere"
+    # LICENSE.txt is installed in the .dist-info directory, so find it there
     sitepkgs = pathlib.Path(mod.__file__).parent.parent
     distinfo_path = [s for s in sitepkgs.glob("numpy-*.dist-info")][0]
 

From aabacc722d469f7152812ae94a87810da012c80a Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Tue, 13 Jun 2023 14:11:49 +0300
Subject: [PATCH 15/29] fix PKG_CONFIG_PATH, force vsenv on windows builds, fix
 glibc version

---
 azure-steps-windows.yml        | 6 ++++--
 numpy/core/tests/test_umath.py | 3 ++-
 pyproject.toml                 | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index 758198e9d6ac..999c436d105e 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -35,6 +35,7 @@ steps:
 
 - powershell: |
     ls openblas
+    # Not strictly needed since we are forcing use of vsenv
     $env:PATH = "$env:RTOOLS43_HOME\\x86_64-w64-mingw32.static.posix\\bin;$env:PATH"
     python -c"import os, pprint; pprint.pprint(os.environ['PATH'])"
     gcc --version
@@ -44,7 +45,7 @@ steps:
         $env:OPENBLAS = "openblas"
     }
     python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
-    python -m pip install .
+    python -m pip install . --config-settings=setup-args="--vsenv"
   displayName: 'Build NumPy'
 
 - script: |
@@ -53,7 +54,8 @@ steps:
   displayName: 'Check OpenBLAS version'
 
 - powershell: |
-    $env:PATH = "$env:RTOOLS43_HOME\\mingw64\\bin;$env:PATH"
+    # Get a gfortran onto the path for f2py tests
+    $env:PATH = "$env:RTOOLS43_HOME\\x86_64-w64-mingw32.static.posix\\bin;$env:PATH"
     If ( Test-Path env:TEST_MODE -eq full ) {
       pytest --pyargs numpy -rsx --junitxml=junit/test-results.xml
     } else {
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
index b186bdb9cf16..0595c8cfec85 100644
--- a/numpy/core/tests/test_umath.py
+++ b/numpy/core/tests/test_umath.py
@@ -4161,7 +4161,8 @@ def test_against_cmath(self):
                 assert_(abs(a - b) < atol, "%s %s: %s; cmath: %s" % (fname, p, a, b))
 
     @pytest.mark.xfail(
-        _glibc_older_than("2.17"),
+        # manylinux2014 uses glibc2.17
+        _glibc_older_than("2.18"),
         reason="Older glibc versions are imprecise (maybe passes with SIMD?)"
     )
     @pytest.mark.xfail(IS_MUSL, reason="gh23049")
diff --git a/pyproject.toml b/pyproject.toml
index 91868d315ba3..99e34868476a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -166,12 +166,12 @@ test-skip = "*_universal2:arm64"
 environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:/a/numpy/numpy/openblas/lib/pkgconfig;"}
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH=D:/a/numpy/numpy/openblas/lib/pkgconfig}
 config-settings = "setup-args=--vsenv"
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
-environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:/a/numpy/numpy/openblas/lib/pkgconfig;"}
+environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32"}
 
 [tool.meson-python.args]
 # These should be the defaults for a normal NumPy build

From 2e84e219632f807d699aeef0a1aa531d71f07a2d Mon Sep 17 00:00:00 2001
From: Matti Picus <matti.picus@gmail.com>
Date: Tue, 13 Jun 2023 19:08:01 +0300
Subject: [PATCH 16/29] reuse parts of scipy's scripts for windows includding
 delvewheel; fix non-wheel build

---
 azure-pipelines.yml               |  4 ++--
 azure-steps-windows.yml           | 35 +++++++++++++++++--------------
 pyproject.toml                    |  5 +++--
 tools/openblas_support.py         |  9 ++++----
 tools/wheels/cibw_before_build.sh | 32 +++++++++++++++++++++-------
 tools/wheels/repair_windows.sh    | 32 ++++++++++++++++++++++++++++
 6 files changed, 86 insertions(+), 31 deletions(-)
 create mode 100644 tools/wheels/repair_windows.sh

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4d1be81bc984..df0da2123d09 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -261,13 +261,13 @@ stages:
             PYTHON_ARCH: 'x64'
             TEST_MODE: full
             BITS: 64
-            NPY_USE_BLAS_ILP64: '1'
+            # NPY_USE_BLAS_ILP64: '1'
           PyPy39-64bit-fast:
             PYTHON_VERSION: 'pypy3.9'
             PYTHON_ARCH: 'x64'
             TEST_MODE: fast
             BITS: 64
-            NPY_USE_BLAS_ILP64: '1'
+            # NPY_USE_BLAS_ILP64: '1'
 
     steps:
     - template: azure-steps-windows.yml
diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index 999c436d105e..11d9e9fd8db6 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -17,35 +17,38 @@ steps:
     # Note that rtools 42+ does not support 32 bits builds. We dropped testing
     # those, but if there's a need to go back on that, use version 4.0.0.20220206
     choco install --confirm --no-progress --side-by-side rtools --version=4.3.5550
+    choco install unzip -y
+    choco install -y --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
     echo "##vso[task.setvariable variable=RTOOLS43_HOME]c:\rtools43"
-  displayName: 'Install rtools'
+  displayName: 'Install utilities'
 
 - powershell: |
     $ErrorActionPreference = "Stop"
-    # Download and get the path to "openblas". We cannot copy it
-    # to $PYTHON_EXE's directory since that is on a different drive which
-    # mingw does not like. Instead copy it to a directory and set OPENBLAS,
-    # since OPENBLAS will be picked up by the openblas discovery
-    $target = $(python tools/openblas_support.py)
-    mkdir openblas
-    echo "Copying $target to openblas/"
-    cp -r $target/* openblas/
-    $env:OPENBLAS = $target
+    mkdir  C:/opt/openblas/openblas_dll
+    mkdir  C:/opt/32/lib/pkgconfig
+    mkdir  C:/opt/64/lib/pkgconfig
+    # TBD: support 32 bit testing
+    $target=$(python -c "import tools.openblas_support as obs; plat=obs.get_plat(); ilp64=obs.get_ilp64(); target=f'openblas_{plat}.zip'; obs.download_openblas(target, plat, ilp64);print(target)")
+    unzip -o -d c:/opt/ $target
+    echo "##vso[task.setvariable variable=PKG_CONFIG_PATH]c:/opt/64/lib/pkgconfig"
+    copy C:/opt/64/bin/*.dll C:/opt/openblas/openblas_dll
   displayName: 'Download / Install OpenBLAS'
 
 - powershell: |
-    ls openblas
-    # Not strictly needed since we are forcing use of vsenv
-    $env:PATH = "$env:RTOOLS43_HOME\\x86_64-w64-mingw32.static.posix\\bin;$env:PATH"
-    python -c"import os, pprint; pprint.pprint(os.environ['PATH'])"
-    gcc --version
     If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
-        $env:OPENBLAS64_ = "openblas"
+        $env:OPENBLAS64_="openblas"
+        # This does not work, the flags are passed together and not separately
+        $env:CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64"
+        $env:CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64"
     } else {
         $env:OPENBLAS = "openblas"
     }
     python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
     python -m pip install . --config-settings=setup-args="--vsenv"
+    # copy from c:/opt/openblas/openblas_dll to numpy/.libs
+    $target = $(python -c "import sysconfig; print(sysconfig.get_path('platlib'))")
+    mkdir $target/numpy/.libs
+    copy C:/opt/openblas/openblas_dll/*.dll $target/numpy/.libs
   displayName: 'Build NumPy'
 
 - script: |
diff --git a/pyproject.toml b/pyproject.toml
index 99e34868476a..97190615c7a4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -166,12 +166,13 @@ test-skip = "*_universal2:arm64"
 environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
-environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH=D:/a/numpy/numpy/openblas/lib/pkgconfig}
+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="C:/opt/64/lib/pkgconfig"}
 config-settings = "setup-args=--vsenv"
+repair-wheel-command = "bash ./tools/wheels/repair_windows.sh {wheel} {dest_dir}"
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"
-environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32"}
+environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
 
 [tool.meson-python.args]
 # These should be the defaults for a normal NumPy build
diff --git a/tools/openblas_support.py b/tools/openblas_support.py
index fd8c6a97a34e..c793805585da 100644
--- a/tools/openblas_support.py
+++ b/tools/openblas_support.py
@@ -182,10 +182,11 @@ def unpack_windows_zip(fname, plat):
     # Copy the lib to openblas.lib. Once we can properly use pkg-config
     # this will not be needed
     lib = glob.glob(os.path.join(target, 'lib', '*.lib'))
-    assert len(lib) == 1
-    for f in lib:
-        shutil.copy(f, os.path.join(target, 'lib', 'openblas.lib'))
-        shutil.copy(f, os.path.join(target, 'lib', 'openblas64_.lib'))
+    if len(lib) == 1:
+        # The 64-bit tarball already has these copied, no need to do it
+        for f in lib:
+            shutil.copy(f, os.path.join(target, 'lib', 'openblas.lib'))
+            shutil.copy(f, os.path.join(target, 'lib', 'openblas64_.lib'))
     # Copy the dll from bin to lib so system_info can pick it up
     dll = glob.glob(os.path.join(target, 'bin', '*.dll'))
     for f in dll:
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
index 0d76ec76538e..372b25af09b8 100644
--- a/tools/wheels/cibw_before_build.sh
+++ b/tools/wheels/cibw_before_build.sh
@@ -29,14 +29,32 @@ if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" ]] ; then
         cp $basedir/include/* /usr/local/include
     fi
 elif [[ $RUNNER_OS == "Windows" ]]; then
+    # delvewheel is the equivalent of delocate/auditwheel for windows.
+    python -m pip install delvewheel
+
+    # make the DLL available for tools/wheels/repair_windows.sh. If you change
+    # this location you need to alter that script.
+    mkdir -p /c/opt/openblas/openblas_dll
+
     PYTHONPATH=tools python -c "import openblas_support; openblas_support.make_init('numpy')"
-    target=$(python tools/openblas_support.py)
-    mkdir -p openblas
-    # bash on windows does not like cp -r $target/* openblas
-    for f in $(ls $target); do
-        cp -r $target/$f openblas
-    done
-    ls openblas
+    mkdir -p /c/opt/32/lib/pkgconfig
+    mkdir -p /c/opt/64/lib/pkgconfig
+    target=$(python -c "import tools.openblas_support as obs; plat=obs.get_plat(); ilp64=obs.get_ilp64(); target=f'openblas_{plat}.zip'; obs.download_openblas(target, plat, ilp64);print(target)")
+    if [[ $PLATFORM == 'win-32' ]]; then
+        # 32-bit openBLAS
+        # Download 32 bit openBLAS and put it into c/opt/32/lib
+        unzip -o -d /c/opt/ $target
+        cp /c/opt/32/bin/*.dll /c/opt/openblas/openblas_dll
+    else
+        # 64-bit openBLAS
+        unzip -o -d /c/opt/ $target
+        if [[ -f /c/opt/64/lib/pkgconfig/openblas64.pc ]]; then
+            # As of v0.3.23, the 64-bit interface has a openblas64.pc file,
+            # but this is wrong. It should be openblas.pc
+            cp /c/opt/64/lib/pkgconfig/openblas{64,}.pc
+        fi
+        cp /c/opt/64/bin/*.dll /c/opt/openblas/openblas_dll
+    fi
 fi
 
 if [[ $RUNNER_OS == "macOS" ]]; then
diff --git a/tools/wheels/repair_windows.sh b/tools/wheels/repair_windows.sh
new file mode 100644
index 000000000000..a7aa209d21d9
--- /dev/null
+++ b/tools/wheels/repair_windows.sh
@@ -0,0 +1,32 @@
+set -xe
+
+WHEEL="$1"
+DEST_DIR="$2"
+
+# create a temporary directory in the destination folder and unpack the wheel
+# into there
+pushd $DEST_DIR
+mkdir -p tmp
+pushd tmp
+wheel unpack $WHEEL
+pushd numpy*
+
+# To avoid DLL hell, the file name of libopenblas that's being vendored with
+# the wheel has to be name-mangled. delvewheel is unable to name-mangle PYD
+# containing extra data at the end of the binary, which frequently occurs when
+# building with mingw.
+# We therefore find each PYD in the directory structure and strip them.
+
+for f in $(find ./scipy* -name '*.pyd'); do strip $f; done
+
+
+# now repack the wheel and overwrite the original
+wheel pack .
+mv -fv *.whl $WHEEL
+
+cd $DEST_DIR
+rm -rf tmp
+
+# the libopenblas.dll is placed into this directory in the cibw_before_build
+# script.
+delvewheel repair --add-path /c/opt/openblas/openblas_dll -w $DEST_DIR $WHEEL

From fae400b435e35c3caf60927477506a7bdd9d3ad4 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Tue, 13 Jun 2023 23:08:08 +0300
Subject: [PATCH 17/29] tweaks and xfail a failing test on windows

---
 azure-steps-windows.yml              | 2 +-
 numpy/random/tests/test_extending.py | 3 +++
 pyproject.toml                       | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index 11d9e9fd8db6..ee60903f22ee 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -59,7 +59,7 @@ steps:
 - powershell: |
     # Get a gfortran onto the path for f2py tests
     $env:PATH = "$env:RTOOLS43_HOME\\x86_64-w64-mingw32.static.posix\\bin;$env:PATH"
-    If ( Test-Path env:TEST_MODE -eq full ) {
+    If ( $env:TEST_MODE -eq "full" ) {
       pytest --pyargs numpy -rsx --junitxml=junit/test-results.xml
     } else {
       pytest --pyargs numpy -m "not slow" -rsx --junitxml=junit/test-results.xml
diff --git a/numpy/random/tests/test_extending.py b/numpy/random/tests/test_extending.py
index 5ace080f1bca..8a82ad9a1657 100644
--- a/numpy/random/tests/test_extending.py
+++ b/numpy/random/tests/test_extending.py
@@ -8,6 +8,8 @@
 from numpy.distutils.misc_util import exec_mod_from_location
 from numpy.testing import IS_WASM
 
+IS_WINDOWS = os.name == "nt"
+
 try:
     import cffi
 except ImportError:
@@ -44,6 +46,7 @@
         cython = None
 
 
+@pytest.mark.xfail(IS_WINDOWS, reason="Wheel builds are missing npyrandom.lib")
 @pytest.mark.skipif(IS_WASM, reason="Can't start subprocess")
 @pytest.mark.skipif(cython is None, reason="requires cython")
 @pytest.mark.slow
diff --git a/pyproject.toml b/pyproject.toml
index 97190615c7a4..180c1cf9dd89 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -174,10 +174,6 @@ repair-wheel-command = "bash ./tools/wheels/repair_windows.sh {wheel} {dest_dir}
 select = "*-win32"
 environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
 
-[tool.meson-python.args]
-# These should be the defaults for a normal NumPy build
-setup = ['-Dbuildtype=custom','-Doptimization=0', '-Db_ndebug=true']
-
 [tool.spin]
 package = 'numpy'
 

From 1a02d5f5d754dde4f72b97b486682d255439a454 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 12:25:20 +0200
Subject: [PATCH 18/29] TST: Azure: avoid running tests from root of repo

This avoids the following failure mode:
```
ImportError while loading conftest 'D:\a\1\s\numpy\conftest.py'.
numpy\__init__.py:130: in <module>
    raise ImportError(msg) from e
E   ImportError: Error importing numpy: you should not try to import numpy from
E           its source directory; please exit the numpy source tree, and relaunch
E           your python interpreter from there.
```
---
 azure-steps-windows.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
index ee60903f22ee..6b9a88667892 100644
--- a/azure-steps-windows.yml
+++ b/azure-steps-windows.yml
@@ -57,6 +57,7 @@ steps:
   displayName: 'Check OpenBLAS version'
 
 - powershell: |
+    cd tools  # avoid root dir to not pick up source tree
     # Get a gfortran onto the path for f2py tests
     $env:PATH = "$env:RTOOLS43_HOME\\x86_64-w64-mingw32.static.posix\\bin;$env:PATH"
     If ( $env:TEST_MODE -eq "full" ) {

From 15cfdecf7ce53aab1daf619d34c0de3e169b1179 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 12:28:44 +0200
Subject: [PATCH 19/29] TST: put back xfail for array-api entrypoint
 temporarily

---
 numpy/tests/test_public_api.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/numpy/tests/test_public_api.py b/numpy/tests/test_public_api.py
index 27619ba3bd95..f8f1095615a6 100644
--- a/numpy/tests/test_public_api.py
+++ b/numpy/tests/test_public_api.py
@@ -472,6 +472,9 @@ def check_importable(module_name):
                              "{}".format(module_names))
 
 
+@pytest.mark.xfail(
+    reason = "meson-python doesn't install this entrypoint correctly yet",
+)
 @pytest.mark.xfail(
     sysconfig.get_config_var("Py_DEBUG") is not None,
     reason=(

From a5ef06ba46fd7098ffd2baaa5244d6bbe415c560 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 12:35:05 +0200
Subject: [PATCH 20/29] REL: don't build 32-bit Python wheels with cibuildwheel

---
 .github/workflows/wheels.yml |  1 -
 pyproject.toml               | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ab3089826d16..23fd8d8a2adf 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -78,7 +78,6 @@ jobs:
           - [ubuntu-20.04, musllinux_x86_64]
           - [macos-12, macosx_x86_64]
           - [windows-2019, win_amd64]
-          - [windows-2019, win32]
         python: ["cp39", "cp310", "cp311"]
         # python: ["cp39", "cp310", "cp311", "pp39"]
         exclude:
diff --git a/pyproject.toml b/pyproject.toml
index 180c1cf9dd89..12d8f70b567f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -142,7 +142,7 @@ tracker = "https://github.com/numpy/numpy/issues"
 
 
 [tool.cibuildwheel]
-skip = "cp36-* cp37-* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux_aarch64"
+skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux_aarch64 *-win32"
 build-verbosity = "3"
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
 before-test = "pip install -r {project}/test_requirements.txt"
@@ -166,13 +166,16 @@ test-skip = "*_universal2:arm64"
 environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
+archs = ['AMD64']
 environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="C:/opt/64/lib/pkgconfig"}
 config-settings = "setup-args=--vsenv"
 repair-wheel-command = "bash ./tools/wheels/repair_windows.sh {wheel} {dest_dir}"
 
-[[tool.cibuildwheel.overrides]]
-select = "*-win32"
-environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
+#[[tool.cibuildwheel.overrides]]
+# Note: 32-bit Python wheel builds are skipped right now; probably needs
+# --native-file to build due to `arch != pyarch` check in Meson's `python` dependency
+#select = "*-win32"
+#environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
 
 [tool.spin]
 package = 'numpy'

From 79484648894c974f68b5bf1624ce1548b13eaabb Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 13:26:37 +0200
Subject: [PATCH 21/29] TST: disable longdouble string/print tests on Linux
 aarch64

See gh-23974
---
 numpy/core/tests/test_arrayprint.py  |  3 +++
 numpy/core/tests/test_longdouble.py  |  2 ++
 numpy/core/tests/test_print.py       | 20 ++++++++++++++------
 numpy/core/tests/test_scalarprint.py | 10 ++++++++--
 numpy/core/tests/test_strings.py     |  4 ++++
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py
index 6796b40777fe..6c1b31fc3541 100644
--- a/numpy/core/tests/test_arrayprint.py
+++ b/numpy/core/tests/test_arrayprint.py
@@ -1,3 +1,4 @@
+import platform
 import sys
 import gc
 from hypothesis import given
@@ -161,6 +162,8 @@ def test_fieldless_structured(self):
 
 
 class TestComplexArray:
+    @pytest.mark.xfail(platform.machine() == 'aarch64',
+                       reason="Failing on Meson build, see gh-23974")
     def test_str(self):
         rvals = [0, 1, -1, np.inf, -np.inf, np.nan]
         cvals = [complex(rp, ip) for rp in rvals for ip in rvals]
diff --git a/numpy/core/tests/test_longdouble.py b/numpy/core/tests/test_longdouble.py
index 45721950c0f1..78f6dbe25d9c 100644
--- a/numpy/core/tests/test_longdouble.py
+++ b/numpy/core/tests/test_longdouble.py
@@ -33,6 +33,8 @@ def test_scalar_extraction():
 # +2 from macro block starting around line 842 in scalartypes.c.src.
 
 
+@pytest.mark.xfail(platform.machine() == 'aarch64',
+                   reason="Failing on Meson build, see gh-23974")
 @pytest.mark.skipif(IS_MUSL,
                     reason="test flaky on musllinux")
 @pytest.mark.skipif(LD_INFO.precision + 2 >= repr_precision,
diff --git a/numpy/core/tests/test_print.py b/numpy/core/tests/test_print.py
index 162686ee00c8..e71947b02458 100644
--- a/numpy/core/tests/test_print.py
+++ b/numpy/core/tests/test_print.py
@@ -1,4 +1,5 @@
 import sys
+import platform
 
 import pytest
 
@@ -12,7 +13,14 @@
 _REF = {np.inf: 'inf', -np.inf: '-inf', np.nan: 'nan'}
 
 
-@pytest.mark.parametrize('tp', [np.float32, np.double, np.longdouble])
+# longdouble printing issue on aarch64, see gh-23974
+if platform.machine() == 'aarch64':
+    _real_dtypes = [np.float32, np.double]
+    _complex_dtypes = [np.complex64, np.cdouble]
+else:
+    _real_dtypes = [np.float32, np.double, np.longdouble]
+    _complex_dtypes = [np.complex64, np.cdouble, np.clongdouble]
+@pytest.mark.parametrize('tp', _real_dtypes)
 def test_float_types(tp):
     """ Check formatting.
 
@@ -34,7 +42,7 @@ def test_float_types(tp):
                      err_msg='Failed str formatting for type %s' % tp)
 
 
-@pytest.mark.parametrize('tp', [np.float32, np.double, np.longdouble])
+@pytest.mark.parametrize('tp', _real_dtypes)
 def test_nan_inf_float(tp):
     """ Check formatting of nan & inf.
 
@@ -48,7 +56,7 @@ def test_nan_inf_float(tp):
                      err_msg='Failed str formatting for type %s' % tp)
 
 
-@pytest.mark.parametrize('tp', [np.complex64, np.cdouble, np.clongdouble])
+@pytest.mark.parametrize('tp', _complex_dtypes)
 def test_complex_types(tp):
     """Check formatting of complex types.
 
@@ -74,7 +82,7 @@ def test_complex_types(tp):
                      err_msg='Failed str formatting for type %s' % tp)
 
 
-@pytest.mark.parametrize('dtype', [np.complex64, np.cdouble, np.clongdouble])
+@pytest.mark.parametrize('dtype', _complex_dtypes)
 def test_complex_inf_nan(dtype):
     """Check inf/nan formatting of complex types."""
     TESTS = {
@@ -119,7 +127,7 @@ def _test_redirected_print(x, tp, ref=None):
                  err_msg='print failed for type%s' % tp)
 
 
-@pytest.mark.parametrize('tp', [np.float32, np.double, np.longdouble])
+@pytest.mark.parametrize('tp', _real_dtypes)
 def test_float_type_print(tp):
     """Check formatting when using print """
     for x in [0, 1, -1, 1e20]:
@@ -135,7 +143,7 @@ def test_float_type_print(tp):
         _test_redirected_print(float(1e16), tp, ref)
 
 
-@pytest.mark.parametrize('tp', [np.complex64, np.cdouble, np.clongdouble])
+@pytest.mark.parametrize('tp', _complex_dtypes)
 def test_complex_type_print(tp):
     """Check formatting when using print """
     # We do not create complex with inf/nan directly because the feature is
diff --git a/numpy/core/tests/test_scalarprint.py b/numpy/core/tests/test_scalarprint.py
index 98d1f4aa11f7..c774ca0b09b1 100644
--- a/numpy/core/tests/test_scalarprint.py
+++ b/numpy/core/tests/test_scalarprint.py
@@ -13,7 +13,11 @@
 class TestRealScalars:
     def test_str(self):
         svals = [0.0, -0.0, 1, -1, np.inf, -np.inf, np.nan]
-        styps = [np.float16, np.float32, np.float64, np.longdouble]
+        # longdouble printing issue on aarch64, see gh-23974
+        if platform.machine() == 'aarch64':
+            styps = [np.float16, np.float32, np.float64]
+        else:
+            styps = [np.float16, np.float32, np.float64, np.longdouble]
         wanted = [
              ['0.0',  '0.0',  '0.0',  '0.0' ],
              ['-0.0', '-0.0', '-0.0', '-0.0'],
@@ -263,7 +267,9 @@ def test_dragon4(self):
     def test_dragon4_interface(self):
         tps = [np.float16, np.float32, np.float64]
         # test is flaky for musllinux on np.float128
-        if hasattr(np, 'float128') and not IS_MUSL:
+        # also currently failing on Linux aarch64 with Meson (see gh-23974)
+        is_aarch64 = platform.machine() == 'aarch64'
+        if hasattr(np, 'float128') and not IS_MUSL and not is_aarch64:
             tps.append(np.float128)
 
         fpos = np.format_float_positional
diff --git a/numpy/core/tests/test_strings.py b/numpy/core/tests/test_strings.py
index 42f775e857b8..bf0e09db1719 100644
--- a/numpy/core/tests/test_strings.py
+++ b/numpy/core/tests/test_strings.py
@@ -1,5 +1,6 @@
 import pytest
 
+import platform
 import operator
 import numpy as np
 
@@ -88,6 +89,9 @@ def test_string_comparisons_empty(op, ufunc, sym, dtypes):
 @pytest.mark.parametrize("str_dt", ["S", "U"])
 @pytest.mark.parametrize("float_dt", np.typecodes["AllFloat"])
 def test_float_to_string_cast(str_dt, float_dt):
+    if platform.machine() == 'aarch64' and float_dt == 'g':
+        pytest.xfail("string repr issues with longdouble, see gh-23974")
+
     float_dt = np.dtype(float_dt)
     fi = np.finfo(float_dt)
     arr = np.array([np.nan, np.inf, -np.inf, fi.max, fi.min], dtype=float_dt)

From c808cfd5c359c11b85690a101e9606eb9c7b8826 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 13:59:35 +0200
Subject: [PATCH 22/29] BLD: hack around broken long double size detection on
 32-bit Linux

---
 numpy/core/meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/numpy/core/meson.build b/numpy/core/meson.build
index 3427de408f1c..220b44c0fc4c 100644
--- a/numpy/core/meson.build
+++ b/numpy/core/meson.build
@@ -372,8 +372,9 @@ if longdouble_size == 8
     longdouble_format = 'IEEE_DOUBLE_BE'
   endif
 elif longdouble_size == 12
-  error('This should not be possible, 12 bits of "content" should still result in sizeof() being 16. Please report this error!'
-  )
+  # This is a HACK to make the build work on 32-bit Linux
+  longdouble_format = 'INTEL_EXTENDED_16_BYTES_LE'
+  #error('This should not be possible, 12 bits of "content" should still result in sizeof() being 16. Please report this error!')
 elif longdouble_size == 16
   if host_machine.endian() == 'little'
     # FIXME: this varies, there's multiple formats here! Not yet implemented.

From 9d588cf1ca80a9a85163a9353ba39d8508b6b26b Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 14:09:20 +0200
Subject: [PATCH 23/29] TST: fix deprecation warnings from f2py test for ndim>0

Representative subset of warnings observed in CI:
```
f2py/tests/test_return_integer.py: 20 warnings
  /tmp/tmp.roLIRtEhPN/venv/lib/python3.9/site-packages/numpy/f2py/tests/test_return_integer.py:24: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
    assert t(array([123], "d")) == 123

f2py/tests/test_return_real.py: 20 warnings
  /tmp/tmp.roLIRtEhPN/venv/lib/python3.9/site-packages/numpy/f2py/tests/test_return_real.py:23: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
    assert abs(t(array([234])) - 234.0) <= err

f2py/tests/test_return_real.py: 20 warnings
  /tmp/tmp.roLIRtEhPN/venv/lib/python3.9/site-packages/numpy/f2py/tests/test_return_real.py:24: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
    assert abs(t(array([[234]])) - 234.0) <= err
```
---
 numpy/f2py/tests/test_return_integer.py | 16 +++++++---------
 numpy/f2py/tests/test_return_real.py    | 16 +++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py
index a43c677fd0af..3b2f42e2bff6 100644
--- a/numpy/f2py/tests/test_return_integer.py
+++ b/numpy/f2py/tests/test_return_integer.py
@@ -13,15 +13,13 @@ def check_function(self, t, tname):
         assert t([123]) == 123
         assert t((123, )) == 123
         assert t(array(123)) == 123
-        assert t(array([123])) == 123
-        assert t(array([[123]])) == 123
-        assert t(array([123], "b")) == 123
-        assert t(array([123], "h")) == 123
-        assert t(array([123], "i")) == 123
-        assert t(array([123], "l")) == 123
-        assert t(array([123], "B")) == 123
-        assert t(array([123], "f")) == 123
-        assert t(array([123], "d")) == 123
+        assert t(array(123, "b")) == 123
+        assert t(array(123, "h")) == 123
+        assert t(array(123, "i")) == 123
+        assert t(array(123, "l")) == 123
+        assert t(array(123, "B")) == 123
+        assert t(array(123, "f")) == 123
+        assert t(array(123, "d")) == 123
 
         # pytest.raises(ValueError, t, array([123],'S3'))
         pytest.raises(ValueError, t, "abc")
diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py
index 9e76c151e88e..a15d6475a950 100644
--- a/numpy/f2py/tests/test_return_real.py
+++ b/numpy/f2py/tests/test_return_real.py
@@ -20,15 +20,13 @@ def check_function(self, t, tname):
         assert abs(t([234]) - 234) <= err
         assert abs(t((234, )) - 234.0) <= err
         assert abs(t(array(234)) - 234.0) <= err
-        assert abs(t(array([234])) - 234.0) <= err
-        assert abs(t(array([[234]])) - 234.0) <= err
-        assert abs(t(array([234]).astype("b")) + 22) <= err
-        assert abs(t(array([234], "h")) - 234.0) <= err
-        assert abs(t(array([234], "i")) - 234.0) <= err
-        assert abs(t(array([234], "l")) - 234.0) <= err
-        assert abs(t(array([234], "B")) - 234.0) <= err
-        assert abs(t(array([234], "f")) - 234.0) <= err
-        assert abs(t(array([234], "d")) - 234.0) <= err
+        assert abs(t(array(234).astype("b")) + 22) <= err
+        assert abs(t(array(234, "h")) - 234.0) <= err
+        assert abs(t(array(234, "i")) - 234.0) <= err
+        assert abs(t(array(234, "l")) - 234.0) <= err
+        assert abs(t(array(234, "B")) - 234.0) <= err
+        assert abs(t(array(234, "f")) - 234.0) <= err
+        assert abs(t(array(234, "d")) - 234.0) <= err
         if tname in ["t0", "t4", "s0", "s4"]:
             assert t(1e200) == t(1e300)  # inf
 

From c41a1e2083566665415b77601f7a0d6d5316c7be Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 15:09:21 +0200
Subject: [PATCH 24/29] TST: xfail einsum int8/uint8 test temporarily

---
 numpy/core/tests/test_einsum.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/numpy/core/tests/test_einsum.py b/numpy/core/tests/test_einsum.py
index 3a06d119fe0e..7ae1bf67d6b1 100644
--- a/numpy/core/tests/test_einsum.py
+++ b/numpy/core/tests/test_einsum.py
@@ -1,4 +1,6 @@
 import itertools
+import sys
+import platform
 
 import pytest
 
@@ -609,9 +611,13 @@ def check_einsum_sums(self, dtype, do_opt=False):
                            [2.])  # contig_stride0_outstride0_two
 
     def test_einsum_sums_int8(self):
+        if sys.platform == 'darwin' and platform.machine() == 'x86_64':
+            pytest.xfail('Fails on macOS x86-64 with Meson, see gh-23838')
         self.check_einsum_sums('i1')
 
     def test_einsum_sums_uint8(self):
+        if sys.platform == 'darwin' and platform.machine() == 'x86_64':
+            pytest.xfail('Fails on macOS x86-64 with Meson, see gh-23838')
         self.check_einsum_sums('u1')
 
     def test_einsum_sums_int16(self):

From 515403f2c637cb58f8dc326d88dd6f768f027cf4 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 15:56:23 +0200
Subject: [PATCH 25/29] TST: disable `test_new_policy` test for memory
 allocator.

This is way too slow, running a large part of the test suite twice.
Issue 23975 tracks changing how this feature is tested.
---
 numpy/core/tests/test_mem_policy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/numpy/core/tests/test_mem_policy.py b/numpy/core/tests/test_mem_policy.py
index b4e2f65916ca..0855d60771a3 100644
--- a/numpy/core/tests/test_mem_policy.py
+++ b/numpy/core/tests/test_mem_policy.py
@@ -359,7 +359,7 @@ def test_thread_locality(get_module):
     assert np.core.multiarray.get_handler_name() == orig_policy_name
 
 
-@pytest.mark.slow
+@pytest.mark.skip(reason="too slow, see gh-23975")
 def test_new_policy(get_module):
     a = np.arange(10)
     orig_policy_name = np.core.multiarray.get_handler_name(a)

From 910c686eacb5d52d11d3b37ca051660d7d41f4c9 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 16:29:11 +0200
Subject: [PATCH 26/29] CI: avoid use of pytest for 32-bit Linux Azure job;
 remove xml coverage

---
 azure-pipelines.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index df0da2123d09..1caa5ac5a40e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -114,16 +114,9 @@ stages:
             python3 -m pip install -r test_requirements.txt && \
             echo CFLAGS \$CFLAGS && \
             python3 -m pip install -v . && \
-            python3 runtests.py -n --debug-info --mode=full -- -rsx --junitxml=junit/test-results.xml && \
-            python3 -m pip install threadpoolctl && \
-            python3 tools/openblas_support.py --check_version"
+            cd tools && \
+            python3 -m pytest --pyargs numpy"
       displayName: 'Run 32-bit manylinux2014 Docker Build / Tests'
-    - task: PublishTestResults@2
-      condition: succeededOrFailed()
-      inputs:
-        testResultsFiles: '**/test-*.xml'
-        failTaskOnFailedTests: true
-        testRunTitle: 'Publish test results for Python 3.9-32 bit full Linux'
 
 
   - job: macOS

From 69f26cf52ce9d57ef1c344798b965bee94fd1a89 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 18:38:06 +0200
Subject: [PATCH 27/29] CI: fix ILP64 usage on macOS arm64 with cibuildwheel

Also remove a no longer needed `-std=c99` (this is already specified
in the top-level `meson.build` file).
---
 pyproject.toml             | 4 ++--
 tools/ci/cirrus_wheels.yml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 12d8f70b567f..a983b2704c4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -152,7 +152,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="-Wl,--strip-debug", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux"}
+environment = { CFLAGS="-fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="-Wl,--strip-debug", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux"}
 
 [tool.cibuildwheel.macos]
 # For universal2 wheels, we will need to fuse them manually
@@ -163,7 +163,7 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -
 archs = "x86_64 arm64"
 test-skip = "*_universal2:arm64"
 # MACOS linker doesn't support stripping symbols
-environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
+environment = { CFLAGS="-fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
 archs = ['AMD64']
diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index f4618de004d6..e20fcfc97c15 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -68,7 +68,8 @@ macosx_arm64_task:
       RUNNER_OS=macOS
       SDKROOT=/Applications/Xcode-14.0.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
       LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-      CFLAGS="-std=c99 -fno-strict-aliasing"
+      CFLAGS="-fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64"
+      CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64"
       OPENBLAS64_="/usr/local"
       NPY_USE_BLAS_ILP64="1"
 

From 302f24424e8c18030d08675b1a493461ddb5488b Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 18:47:24 +0200
Subject: [PATCH 28/29] CI: disable pypy3.9 job on Azure temporarily

---
 azure-pipelines.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1caa5ac5a40e..7f32a1bd1dd6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -255,12 +255,14 @@ stages:
             TEST_MODE: full
             BITS: 64
             # NPY_USE_BLAS_ILP64: '1'
-          PyPy39-64bit-fast:
-            PYTHON_VERSION: 'pypy3.9'
-            PYTHON_ARCH: 'x64'
-            TEST_MODE: fast
-            BITS: 64
-            # NPY_USE_BLAS_ILP64: '1'
+            # TODO: failing because of an issue with ILP64 BLAS being downloaded,
+            #       and that not being handled automatically yet
+            # PyPy39-64bit-fast:
+              # PYTHON_VERSION: 'pypy3.9'
+              # PYTHON_ARCH: 'x64'
+              # TEST_MODE: fast
+              # BITS: 64
+              # NPY_USE_BLAS_ILP64: '1'
 
     steps:
     - template: azure-steps-windows.yml

From 11a3cef096ec3ab346cb0c7c43d1878d6174da72 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 18 Jun 2023 20:35:49 +0200
Subject: [PATCH 29/29] BLD: on 32-bit Linux, if `sizeof(long double)` is 12,
 change format

[skip circle] [skip cirrus]
---
 numpy/core/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/numpy/core/meson.build b/numpy/core/meson.build
index 220b44c0fc4c..7d9a0f5d49a4 100644
--- a/numpy/core/meson.build
+++ b/numpy/core/meson.build
@@ -372,8 +372,8 @@ if longdouble_size == 8
     longdouble_format = 'IEEE_DOUBLE_BE'
   endif
 elif longdouble_size == 12
-  # This is a HACK to make the build work on 32-bit Linux
-  longdouble_format = 'INTEL_EXTENDED_16_BYTES_LE'
+  # This is hardcoded to make the build work on 32-bit Linux
+  longdouble_format = 'INTEL_EXTENDED_12_BYTES_LE'
   #error('This should not be possible, 12 bits of "content" should still result in sizeof() being 16. Please report this error!')
 elif longdouble_size == 16
   if host_machine.endian() == 'little'
@@ -384,7 +384,7 @@ elif longdouble_size == 16
     error('No idea what this is ....')
   endif
 else
-  error('Unknown long double size: ' + londouble_size)
+  error('Unknown long double size: ' + longdouble_size)
 endif
 cdata.set10('HAVE_LDOUBLE_' + longdouble_format, true)