Thanks to visit codestin.com
Credit goes to github.com

Skip to content

API: Update lib.nanfunctions namespace #24536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2023
Merged

API: Update lib.nanfunctions namespace #24536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions numpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,7 @@
iscomplexobj, isin, isneginf, isreal, isrealobj, issubclass_,
issubsctype, iterable, ix_, kaiser, kron, load, loadtxt, mask_indices,
median, meshgrid, mgrid, mintypecode, nan_to_num,
nanargmax, nanargmin, nancumprod, nancumsum, nanmax, nanmean,
nanmedian, nanmin, nanpercentile, nanprod, nanquantile, nanstd,
nansum, nanvar, ndenumerate, ndindex, ogrid, packbits, pad,
ndenumerate, ndindex, ogrid, packbits, pad,
percentile, piecewise, place, poly, poly1d, polyadd, polyder,
polydiv, polyfit, polyint, polymul, polysub, polyval,
put_along_axis, quantile, r_, ravel_multi_index, real, real_if_close,
Expand All @@ -219,6 +217,11 @@
from .lib._histograms_impl import (
histogram, histogram_bin_edges, histogramdd
)
from .lib._nanfunctions_impl import (
nanargmax, nanargmin, nancumprod, nancumsum, nanmax, nanmean,
nanmedian, nanmin, nanpercentile, nanprod, nanquantile, nanstd,
nansum, nanvar
)
from . import matrixlib as _mat
from .matrixlib import (
asmatrix, bmat, mat, matrix
Expand Down Expand Up @@ -280,6 +283,7 @@
__all__ = list(
__numpy_submodules__ | set(core.__all__) | set(lib.__all__) |
set(_mat.__all__) | set(lib._histograms_impl.__all__) |
set(lib._nanfunctions_impl.__all__) |
{"show_config", "__version__"}
)

Expand Down
2 changes: 1 addition & 1 deletion numpy/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ from numpy.lib.index_tricks import (
diag_indices_from as diag_indices_from,
)

from numpy.lib.nanfunctions import (
from numpy.lib._nanfunctions_impl import (
nansum as nansum,
nanmax as nanmax,
nanmin as nanmin,
Expand Down
4 changes: 1 addition & 3 deletions numpy/lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from . import type_check
from . import index_tricks
from . import function_base
from . import nanfunctions
from . import _nanfunctions_impl
from . import shape_base
from . import stride_tricks
from . import twodim_base
Expand All @@ -39,7 +39,6 @@
from .type_check import *
from .index_tricks import *
from .function_base import *
from .nanfunctions import *
from .shape_base import *
from .stride_tricks import *
from .twodim_base import *
Expand Down Expand Up @@ -69,7 +68,6 @@
__all__ += utils.__all__
__all__ += arraysetops.__all__
__all__ += npyio.__all__
__all__ += nanfunctions.__all__

from numpy._pytesttester import PytestTester
test = PytestTester(__name__)
Expand Down
17 changes: 0 additions & 17 deletions numpy/lib/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,6 @@ from numpy.lib.index_tricks import (
diag_indices_from as diag_indices_from,
)

from numpy.lib.nanfunctions import (
nansum as nansum,
nanmax as nanmax,
nanmin as nanmin,
nanargmax as nanargmax,
nanargmin as nanargmin,
nanmean as nanmean,
nanmedian as nanmedian,
nanpercentile as nanpercentile,
nanvar as nanvar,
nanstd as nanstd,
nanprod as nanprod,
nancumsum as nancumsum,
nancumprod as nancumprod,
nanquantile as nanquantile,
)

from numpy.lib.npyio import (
savetxt as savetxt,
loadtxt as loadtxt,
Expand Down
0 numpy/lib/nanfunctions.py → numpy/lib/_nanfunctions_impl.py
View file
Open in desktop
File renamed without changes.
0 numpy/lib/nanfunctions.pyi → numpy/lib/_nanfunctions_impl.pyi
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions numpy/lib/tests/test_nanfunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
from numpy.core.numeric import normalize_axis_tuple
from numpy.exceptions import AxisError, ComplexWarning
from numpy.lib.nanfunctions import _nan_mask, _replace_nan
from numpy.lib._nanfunctions_impl import _nan_mask, _replace_nan
from numpy.testing import (
assert_, assert_equal, assert_almost_equal, assert_raises,
assert_raises_regex, assert_array_equal, suppress_warnings
Expand Down Expand Up @@ -81,7 +81,7 @@ def test_signature_match(self, nan_func, func):
def test_exhaustiveness(self):
"""Validate that all nan functions are actually tested."""
np.testing.assert_equal(
set(self.IDS), set(np.lib.nanfunctions.__all__)
set(self.IDS), set(np.lib._nanfunctions_impl.__all__)
)


Expand Down
1 change: 0 additions & 1 deletion numpy/tests/test_public_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ def test_NPY_NO_EXPORT():
"lib.arrayterator",
"lib.function_base",
"lib.index_tricks",
"lib.nanfunctions",
"lib.npyio",
"lib.polynomial",
"lib.shape_base",
Expand Down