API: Update lib.histograms namespace (#24513)

mtsokol · web-flow · commit 89a6f3ee13c5 · 2023-08-24T12:09:17.000+02:00
[skip ci]
diff --git a/numpy/__init__.py b/numpy/__init__.py
@@ -195,8 +195,8 @@
         diag_indices_from, diagflat, diff, digitize, dsplit, dstack,
         ediff1d, emath, expand_dims, extract, eye, fill_diagonal, fix,
         flip, fliplr, flipud, fromregex, get_array_wrap, genfromtxt,
-        get_include, gradient, hamming, hanning, histogram, histogram2d,
-        histogram_bin_edges, histogramdd, hsplit, i0, imag, in1d,
+        get_include, gradient, hamming, hanning, histogram2d,
+        hsplit, i0, imag, in1d,
         index_exp, info, insert, interp, intersect1d, iscomplex,
         iscomplexobj, isin, isneginf, isreal, isrealobj, issubclass_,
         issubsctype, iterable, ix_, kaiser, kron, load, loadtxt, mask_indices,
@@ -215,6 +215,9 @@
         triu, triu_indices, triu_indices_from, isposinf, disp,
         deprecate, deprecate_with_doc, safe_eval, recfromtxt, recfromcsv
     )
+    from .lib._histograms_impl import (
+        histogram, histogram_bin_edges, histogramdd
+    )
     from . import matrixlib as _mat
     from .matrixlib import (
         asmatrix, bmat, mat, matrix
@@ -275,7 +278,8 @@
 
     __all__ = list(
         __numpy_submodules__ | set(core.__all__) | set(lib.__all__) | 
-        set(_mat.__all__) | {"show_config", "__version__"}
+        set(_mat.__all__) | set(lib._histograms_impl.__all__) | 
+        {"show_config", "__version__"}
     )
 
     # Filter out Cython harmless warnings
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi
@@ -469,7 +469,7 @@ from numpy.lib.function_base import (
     quantile as quantile,
 )
 
-from numpy.lib.histograms import (
+from numpy.lib._histograms_impl import (
     histogram_bin_edges as histogram_bin_edges,
     histogram as histogram,
     histogramdd as histogramdd,
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
@@ -27,7 +27,7 @@
 from . import stride_tricks
 from . import twodim_base
 from . import ufunclike
-from . import histograms
+from . import _histograms_impl
 from . import polynomial
 from . import utils
 from . import arraysetops
@@ -44,7 +44,6 @@
 from .stride_tricks import *
 from .twodim_base import *
 from .ufunclike import *
-from .histograms import *
 
 from .polynomial import *
 from .utils import *
@@ -71,7 +70,6 @@
 __all__ += arraysetops.__all__
 __all__ += npyio.__all__
 __all__ += nanfunctions.__all__
-__all__ += histograms.__all__
 
 from numpy._pytesttester import PytestTester
 test = PytestTester(__name__)
diff --git a/numpy/lib/__init__.pyi b/numpy/lib/__init__.pyi
@@ -83,12 +83,6 @@ from numpy.lib.function_base import (
     quantile as quantile,
 )
 
-from numpy.lib.histograms import (
-    histogram_bin_edges as histogram_bin_edges,
-    histogram as histogram,
-    histogramdd as histogramdd,
-)
-
 from numpy.lib.index_tricks import (
     ravel_multi_index as ravel_multi_index,
     unravel_index as unravel_index,
diff --git a/numpy/lib/_histograms_impl.py b/numpy/lib/_histograms_impl.py
diff --git a/numpy/lib/_histograms_impl.pyi b/numpy/lib/_histograms_impl.pyi
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
@@ -30,7 +30,7 @@
 from numpy._utils import set_module
 
 # needed in this module for compatibility
-from numpy.lib.histograms import histogram, histogramdd  # noqa: F401
+from numpy.lib._histograms_impl import histogram, histogramdd  # noqa: F401
 
 
 array_function_dispatch = functools.partial(
diff --git a/numpy/lib/tests/test_histograms.py b/numpy/lib/tests/test_histograms.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from numpy.lib.histograms import histogram, histogramdd, histogram_bin_edges
+from numpy import histogram, histogramdd, histogram_bin_edges
 from numpy.testing import (
     assert_, assert_equal, assert_array_equal, assert_almost_equal,
     assert_array_almost_equal, assert_raises, assert_allclose,
diff --git a/numpy/tests/test_public_api.py b/numpy/tests/test_public_api.py
@@ -207,7 +207,6 @@ def test_NPY_NO_EXPORT():
     "lib.arraysetops",
     "lib.arrayterator",
     "lib.function_base",
-    "lib.histograms",
     "lib.index_tricks",
     "lib.nanfunctions",
     "lib.npyio",

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ from numpy.lib.function_base import (`
`469`	`469`	`quantile as quantile,`
`470`	`470`	`)`
`471`	`471`
`472`		`-from numpy.lib.histograms import (`
	`472`	`+from numpy.lib._histograms_impl import (`
`473`	`473`	`histogram_bin_edges as histogram_bin_edges,`
`474`	`474`	`histogram as histogram,`
`475`	`475`	`histogramdd as histogramdd,`