unpin numpy (commaai#33132)

* unlock numpy

* remove old cache

* sheel

* lock

* remove temp

* depends

* export

* put this back

* use __version__

* move this

---------

Co-authored-by: quebec <[email protected]>
old-commit-hash: 9536dd0

SConstruct

@@ -229,7 +229,7 @@ env = Environment(
  COMPILATIONDB_USE_ABSPATH=True,
  REDNOSE_ROOT="#",
  tools=["default", "cython", "compilation_db", "rednose_filter"],
- toolpath=["#rednose_repo/site_scons/site_tools"],
+ toolpath=["#site_scons/site_tools", "#rednose_repo/site_scons/site_tools"],
 )
 
 if arch == "Darwin":
@@ -268,7 +268,8 @@ if arch == "Darwin":
 else:
  envCython["LINKFLAGS"] = ["-pthread", "-shared"]
 
-Export('envCython')
+np_version = SCons.Script.Value(np.__version__)
+Export('envCython', 'np_version')
 
 # Qt build environment
 qt_env = env.Clone()

pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
  "pycapnp",
  "Cython",
  "setuptools",
- "numpy < 2.0.0", # control does not support numpy 2
+ "numpy",
 
  # body / webrtcd
  "aiohttp",

selfdrive/controls/lib/lateral_mpc_lib/SConscript

@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python', 'np_version')
 
 gen = "c_generated_code"
 
@@ -88,3 +88,4 @@ lenv2.Command(libacados_ocp_solver_c,
  f' {acados_ocp_solver_pyx.get_labspath()}')
 lib_cython = lenv2.Program(f'{gen}/acados_ocp_solver_pyx.so', [libacados_ocp_solver_c])
 lenv2.Depends(lib_cython, lib_solver)
+lenv2.Depends(libacados_ocp_solver_c, np_version)

selfdrive/controls/lib/longitudinal_mpc_lib/SConscript

@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python', 'np_version')
 
 gen = "c_generated_code"
 
@@ -94,3 +94,4 @@ lenv2.Command(libacados_ocp_solver_c,
  f' {acados_ocp_solver_pyx.get_labspath()}')
 lib_cython = lenv2.Program(f'{gen}/acados_ocp_solver_pyx.so', [libacados_ocp_solver_c])
 lenv2.Depends(lib_cython, lib_solver)
+lenv2.Depends(libacados_ocp_solver_c, np_version)

site_scons/site_tools/cython.py

@@ -2,14 +2,17 @@
 import SCons
 from SCons.Action import Action
 from SCons.Scanner import Scanner
+import numpy as np
 
 pyx_from_import_re = re.compile(r'^from\s+(\S+)\s+cimport', re.M)
 pyx_import_re = re.compile(r'^cimport\s+(\S+)', re.M)
 cdef_import_re = re.compile(r'^cdef extern from\s+.(\S+).:', re.M)
 
+np_version = SCons.Script.Value(np.__version__)
 
 def pyx_scan(node, env, path, arg=None):
  contents = node.get_text_contents()
+ env.Depends(str(node).split('.')[0] + env['CYTHONCFILESUFFIX'], np_version)
 
  # from <module> cimport ...
  matches = pyx_from_import_re.findall(contents)