From 6658e74110f26c8436d990386c37eb932f885265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Sok=C3=B3=C5=82?= Date: Mon, 28 Aug 2023 09:36:37 +0200 Subject: [PATCH] API: Readd add_docstring and add_newdoc to np.lib --- numpy/_expired_attrs_2_0.py | 4 ++-- numpy/lib/__init__.py | 3 ++- numpy/lib/__init__.pyi | 5 +++++ numpy/lib/_function_base_impl.py | 3 +-- numpy/lib/_function_base_impl.pyi | 5 ----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/numpy/_expired_attrs_2_0.py b/numpy/_expired_attrs_2_0.py index 387a37751d09..c7c8e260bea9 100644 --- a/numpy/_expired_attrs_2_0.py +++ b/numpy/_expired_attrs_2_0.py @@ -20,9 +20,9 @@ "NZERO": "Use `-0.0` instead.", "PZERO": "Use `0.0` instead.", "add_newdoc": - "It's an internal function and doesn't have a replacement.", + "It's still available as `np.lib.add_newdoc`.", "add_docstring": - "It's an internal function and doesn't have a replacement.", + "It's still available as `np.lib.add_docstring`.", "add_newdoc_ufunc": "It's an internal function and doesn't have a replacement.", "compat": "There's no replacement, as Python 2 is no longer supported.", diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py index b8845f271efb..cd0583afc5e4 100644 --- a/numpy/lib/__init__.py +++ b/numpy/lib/__init__.py @@ -50,7 +50,8 @@ from .arrayterator import Arrayterator from .arraypad import * from ._version import * -from numpy.core._multiarray_umath import tracemalloc_domain +from numpy.core._multiarray_umath import add_docstring, tracemalloc_domain +from numpy.core.function_base import add_newdoc __all__ = ['emath'] __all__ += type_check.__all__ diff --git a/numpy/lib/__init__.pyi b/numpy/lib/__init__.pyi index 9a10a9934f7f..3f59ddf3753b 100644 --- a/numpy/lib/__init__.pyi +++ b/numpy/lib/__init__.pyi @@ -156,9 +156,14 @@ from numpy.lib.utils import ( ) from numpy.core.multiarray import ( + add_docstring as add_docstring, tracemalloc_domain as tracemalloc_domain, ) +from numpy.core.function_base import ( + add_newdoc as add_newdoc, +) + __all__: list[str] __path__: list[str] test: PytestTester diff --git a/numpy/lib/_function_base_impl.py b/numpy/lib/_function_base_impl.py index 20c55016aa78..8354c332335d 100644 --- a/numpy/lib/_function_base_impl.py +++ b/numpy/lib/_function_base_impl.py @@ -21,10 +21,9 @@ ) from numpy.core.numerictypes import typecodes from numpy.core import overrides -from numpy.core.function_base import add_newdoc from numpy.lib.twodim_base import diag from numpy.core.multiarray import ( - _place, add_docstring, bincount, normalize_axis_index, _monotonicity, + _place, bincount, normalize_axis_index, _monotonicity, interp as compiled_interp, interp_complex as compiled_interp_complex ) from numpy._utils import set_module diff --git a/numpy/lib/_function_base_impl.pyi b/numpy/lib/_function_base_impl.pyi index 210090718f9e..1ba5b0762f94 100644 --- a/numpy/lib/_function_base_impl.pyi +++ b/numpy/lib/_function_base_impl.pyi @@ -48,12 +48,7 @@ from numpy._typing import ( _ComplexLike_co, ) -from numpy.core.function_base import ( - add_newdoc as add_newdoc, -) - from numpy.core.multiarray import ( - add_docstring as add_docstring, bincount as bincount, )