Merge branch 'main' into kernelv2

neurodata · Aug 22, 2024 · a73e5a7 · a73e5a7
2 parents 7d74b36 + 244c706
commit a73e5a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
 
   # Ruff treeple
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.6.1
     hooks:
       - id: ruff
         name: ruff treeple
@@ -31,7 +31,7 @@ repos:
 
   # Ruff tutorials and examples
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.6.1
     hooks:
       - id: ruff
         name: ruff tutorials and examples

diff --git a/treeple/_lib/sklearn_fork b/treeple/_lib/sklearn_fork
diff --git a/treeple/meson.build b/treeple/meson.build
@@ -80,7 +80,11 @@ print(incdir)
 endif
 
 inc_np = include_directories(incdir_numpy)
-np_dep = declare_dependency(include_directories: inc_np)
+# Don't use the deprecated NumPy C API. Define this to a fixed version instead of
+# NPY_API_VERSION in order not to break compilation for released SciPy versions
+# when NumPy introduces a new deprecation.
+numpy_no_deprecated_api = ['-DNPY_NO_DEPRECATED_API=NPY_1_9_API_VERSION']
+np_dep = declare_dependency(include_directories: inc_np, compile_args: numpy_no_deprecated_api)
 
 cc = meson.get_compiler('c')
 
@@ -91,7 +95,6 @@ cc = meson.get_compiler('c')
 # py.extension_module('_name',
 #   'source_fname',
 #   numpy_nodepr_api)
-numpy_nodepr_api = '-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION'
 
 # XXX: ENABLE WHEN DEBUGGING
 boundscheck = 'False'
@@ -106,8 +109,6 @@ scikit_learn_cython_args = [
 ]
 cython_c_args += scikit_learn_cython_args
 
-c_args += numpy_nodepr_api
-
 python_sources = [
   '__init__.py',
   'neighbors.py',