From 63f73bebef0fd09f977a4e0de2cbe0caa3e5517c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:15:26 -0400 Subject: [PATCH 1/3] [pre-commit.ci] pre-commit autoupdate (#313) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.6 → v0.5.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.6...v0.5.7) - [github.com/astral-sh/ruff-pre-commit: v0.5.6 → v0.5.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.6...v0.5.7) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e63831a75..7cf264941 100644 --- 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.5.7 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.5.7 hooks: - id: ruff name: ruff tutorials and examples From 4062dfd8ed8e1290ff6c17b87367634ff4b0b458 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:49:31 -0400 Subject: [PATCH 2/3] [pre-commit.ci] pre-commit autoupdate (#315) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.7 → v0.6.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.7...v0.6.1) - [github.com/astral-sh/ruff-pre-commit: v0.5.7 → v0.6.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.7...v0.6.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7cf264941..6fd0aecb4 100644 --- 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.7 + 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.7 + rev: v0.6.1 hooks: - id: ruff name: ruff tutorials and examples From 244c706feb1a39f6cb87f699e735a9a9a3d12293 Mon Sep 17 00:00:00 2001 From: Adam Li Date: Tue, 20 Aug 2024 19:49:06 -0400 Subject: [PATCH 3/3] MAINT Remove NPY deprecated api warnings during meson build (#318) * Fix meson compile warnings to NPY_1_9 --------- Signed-off-by: Adam Li --- treeple/_lib/sklearn_fork | 2 +- treeple/meson.build | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/treeple/_lib/sklearn_fork b/treeple/_lib/sklearn_fork index b201fcb94..ac5cb8abd 160000 --- a/treeple/_lib/sklearn_fork +++ b/treeple/_lib/sklearn_fork @@ -1 +1 @@ -Subproject commit b201fcb945fa54979a93bf8cc11f88c17d4b8fc9 +Subproject commit ac5cb8abd5c9b425c3c02a2be1d91296adf643a3 diff --git a/treeple/meson.build b/treeple/meson.build index 13b69ec1f..3d1715dbe 100644 --- 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',