8000 API: Update lib.type_check namespace · numpy/numpy@c538d79 · GitHub
[go: up one dir, main page]
Skip to content

Commit c538d79

Browse files
mtsokolmtsokol
committed
API: Update lib.type_check namespace
1 parent b6b6f22 commit c538d79

File tree

11 files changed

+23
-36
lines changed

11 files changed

+23
-36
lines changed

‎numpy/__init__.py‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,36 +189,40 @@
189189
from . import lib
190190
from .lib import (
191191
DataSource, angle, append, apply_along_axis, apply_over_axes,
192-
array_split, asarray_chkfinite, asfarray, average, bartlett,
192+
array_split, asarray_chkfinite, average, bartlett,
193193
bincount, blackman, broadcast_arrays, broadcast_shapes,
194-
broadcast_to, byte_bounds, c_, column_stack, common_type,
194+
broadcast_to, byte_bounds, c_, column_stack,
195195
copy, corrcoef, cov, delete, diag, diag_indices,
196196
diag_indices_from, diagflat, diff, digitize, dsplit, dstack,
197197
ediff1d, emath, expand_dims, extract, eye, fill_diagonal, fix,
198198
flip, fliplr, flipud, fromregex, get_array_wrap, genfromtxt,
199199
get_include, gradient, hamming, hanning, histogram2d,
200-
hsplit, i0, imag, in1d,
201-
index_exp, info, insert, interp, intersect1d, iscomplex,
202-
iscomplexobj, isin, isneginf, isreal, isrealobj, issubclass_,
200+
hsplit, i0, in1d,
201+
index_exp, info, insert, interp, intersect1d,
202+
isin, isneginf, issubclass_,
203203
issubsctype, iterable, ix_, kaiser, kron, load, loadtxt, mask_indices,
204-
median, meshgrid, mgrid, mintypecode, nan_to_num,
204+
median, meshgrid, mgrid,
205205
nanargmax, nanargmin, nancumprod, nancumsum, nanmax, nanmean,
206206
nanmedian, nanmin, nanpercentile, nanprod, nanquantile, nanstd,
207207
nansum, nanvar, ndenumerate, ndindex, ogrid, packbits, pad,
208208
percentile, piecewise, place, poly, poly1d, polyadd, polyder,
209209
polydiv, polyfit, polyint, polymul, polysub, polyval,
210-
put_along_axis, quantile, r_, ravel_multi_index, real, real_if_close,
210+
put_along_axis, quantile, r_, ravel_multi_index,
211211
roots, rot90, row_stack, s_, save, savetxt, savez, savez_compressed,
212212
select, setdiff1d, setxor1d, show_runtime, sinc, sort_complex, split,
213213
take_along_axis, tile, tracemalloc_domain, trapz, tri, tril,
214-
tril_indices, tril_indices_from, typename, union1d, unique, unpackbits,
214+
tril_indices, tril_indices_from, union1d, unique, unpackbits,
215215
unravel_index, unwrap, vander, vectorize, vsplit, trim_zeros,
216216
triu, triu_indices, triu_indices_from, isposinf, disp,
217217
deprecate, deprecate_with_doc, safe_eval, recfromtxt, recfromcsv
218218
)
219219
from .lib._histograms_impl import (
220220
histogram, histogram_bin_edges, histogramdd
221221
)
222+
from .lib._type_check_impl import (
223+
asfarray, iscomplexobj, isrealobj, imag, iscomplex, isreal,
224+
nan_to_num, real, real_if_close, typename, mintypecode, common_type
225+
)
222226
from . import matrixlib as _mat
223227
from .matrixlib import (
224228
asmatrix, bmat, mat, matrix
@@ -279,7 +283,8 @@
279283

280284
__all__ = list(
281285
__numpy_submodules__ | set(core.__all__) | set(lib.__all__) |
282-
set(_mat.__all__) | set(lib._histograms_impl.__all__) |
286+
set(_mat.__all__) | set(lib._histograms_impl.__all__) |
287+
set(lib._type_check_impl.__all__) |
283288
{"show_config", "__version__"}
284289
)
285290

‎numpy/__init__.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ from numpy.lib.twodim_base import (
578578
triu_indices_from as triu_indices_from,
579579
)
580580

581-
from numpy.lib.type_check import (
581+
from numpy.lib._type_check_impl import (
582582
mintypecode as mintypecode,
583583
asfarray as asfarray,
584584
real as real,

‎numpy/lib/__init__.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# Private submodules
2121
# load module names. See https://github.com/networkx/networkx/issues/5838
22-
from . import type_check
22+
from . import _type_check_impl
2323
from . import index_tricks
2424
from . import function_base
2525
from . import nanfunctions
@@ -36,7 +36,6 @@
3636
from . import arraypad
3737
from . import _version
3838

39-
from .type_check import *
4039
from .index_tricks import *
4140
from .function_base import *
4241
from .nanfunctions import *
@@ -57,7 +56,6 @@
5756

5857

5958
__all__ = ['emath', 'tracemalloc_domain']
60-
__all__ += type_check.__all__
6159
__all__ += index_tricks.__all__
6260
__all__ += function_base.__all__
6361
__all__ += shape_base.__all__

‎numpy/lib/__init__.pyi‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -188,21 +188,6 @@ from numpy.lib.twodim_base import (
188188
triu_indices_from as triu_indices_from,
189189
)
190190

191-
from numpy.lib.type_check import (
192-
mintypecode as mintypecode,
193-
asfarray as asfarray,
194-
real as real,
195-
imag as imag,
196-
iscomplex as iscomplex,
197-
isreal as isreal,
198-
iscomplexobj as iscomplexobj,
199-
isrealobj as isrealobj,
200-
nan_to_num as nan_to_num,
201-
real_if_close as real_if_close,
202-
typename as typename,
203-
common_type as common_type,
204-
)
205-
206191
from numpy.lib.ufunclike import (
207192
fix as fix,
208193
isposinf as isposinf,

‎numpy/lib/type_check.py‎ renamed to ‎numpy/lib/_type_check_impl.py‎

File renamed without changes.

‎numpy/lib/type_check.pyi‎ renamed to ‎numpy/lib/_type_check_impl.pyi‎

File renamed without changes.

‎numpy/lib/polynomial.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from numpy.exceptions import RankWarning
2020
from numpy.lib.twodim_base import diag, vander
2121
from numpy.lib.function_base import trim_zeros
22-
from numpy.lib.type_check import iscomplex, real, imag, mintypecode
22+
from numpy.lib._type_check_impl import iscomplex, real, imag, mintypecode
2323
from numpy.linalg import eigvals, lstsq, inv
2424

2525

‎numpy/lib/scimath.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import numpy.core.numerictypes as nt
3535
from numpy.core.numeric import asarray, any
3636
from numpy.core.overrides import array_function_dispatch
37-
from numpy.lib.type_check import isreal
< 6284 /code>37+
from numpy.lib._type_check_impl import isreal
3838

3939

4040
__all__ = [

‎numpy/lib/tests/test_type_check.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import numpy as np
2-
from numpy.testing import (
3-
assert_, assert_equal, assert_array_equal, assert_raises
4-
)
5-
from numpy.lib.type_check import (
2+
from numpy import (
63
common_type, mintypecode, isreal, iscomplex, isposinf, isneginf,
74
nan_to_num, isrealobj, iscomplexobj, asfarray, real_if_close
85
)
6+
from numpy.testing import (
7+
assert_, assert_equal, assert_array_equal, assert_raises
8+
)
99

1010

1111
def assert_all(x):

‎numpy/testing/_private/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def assert_equal(actual, desired, err_msg='', verbose=True):
277277
verbose)
278278
return
279279
from numpy.core import ndarray, isscalar, signbit
280-
from numpy.lib import iscomplexobj, real, imag
280+
from numpy import iscomplexobj, real, imag
281281
if isinstance(actual, ndarray) or isinstance(desired, ndarray):
282282
return assert_array_equal(actual, desired, err_msg, verbose)
283283
msg = build_err_msg([actual, desired], err_msg, verbose=verbose)

0 commit comments

Comments
 (0)
0