From 165cb16790021e6840d59b03104f691b16ba1413 Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Thu, 2 Nov 2023 10:37:26 -0400
Subject: [PATCH] Add numpy to build dependencies

---
 .github/workflows/dist.yml                 | 5 -----
 devtools/subproject.py                     | 1 +
 subprojects/robotpy-cscore/pyproject.toml  | 2 +-
 subprojects/robotpy-wpimath/pyproject.toml | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index ed99cf5c..4c90ae08 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -117,11 +117,6 @@ jobs:
       run: |
         python -m pip --disable-pip-version-check install -r rdev_requirements.txt
 
-    - name: Install numpy (needed for stubgen but broken in raspbian CI)
-      shell: bash
-      run: |
-        python -m pip --disable-pip-version-check install 'numpy<2'
-
     - name: Build + test wheels
       shell: bash
       run: |
diff --git a/devtools/subproject.py b/devtools/subproject.py
index 526fecad..cc7be6dd 100644
--- a/devtools/subproject.py
+++ b/devtools/subproject.py
@@ -45,6 +45,7 @@ def install_build_deps(self, *, wheel_path: pathlib.Path):
             "pip",
             "install",
             "--disable-pip-version-check",
+            "--prefer-binary",
             "--find-links",
             str(wheel_path),
             *[str(req) for req in self.requires],
diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml
index ee8dc591..11c3eadb 100644
--- a/subprojects/robotpy-cscore/pyproject.toml
+++ b/subprojects/robotpy-cscore/pyproject.toml
@@ -17,7 +17,7 @@ requires = [
     "robotpy-wpiutil~=2024.0.0b2",
     "robotpy-wpinet~=2024.0.0b2",
     "pyntcore~=2024.0.0b2",
-    # "numpy", # required for pybind11-stubgen to not complain, broken in raspbian CI
+    "numpy", # required for pybind11-stubgen to not complain
 ]
 
 [tool.robotpy-build]
diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml
index 43b0cf2f..85dd1343 100644
--- a/subprojects/robotpy-wpimath/pyproject.toml
+++ b/subprojects/robotpy-wpimath/pyproject.toml
@@ -13,7 +13,7 @@ install_requires = [
 requires = [
     "robotpy-build<2025.0.0,~=2024.0.0b2",
     "robotpy-wpiutil~=2024.0.0b2",
-    # "numpy", # broken in raspbian CI
+    "numpy", # required for pybind11-stubgen to not complain
 ]
 
 [tool.robotpy-build]