summaryrefslogtreecommitdiff
path: root/numpy/typing/tests
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/typing/tests')
-rw-r--r--numpy/typing/tests/data/fail/array_like.pyi2
-rw-r--r--numpy/typing/tests/data/fail/flatiter.pyi2
-rw-r--r--numpy/typing/tests/data/fail/nested_sequence.pyi4
-rw-r--r--numpy/typing/tests/data/mypy.ini1
-rw-r--r--numpy/typing/tests/data/pass/array_like.py2
-rw-r--r--numpy/typing/tests/data/reveal/arithmetic.pyi5
-rw-r--r--numpy/typing/tests/data/reveal/ndarray_misc.pyi2
-rw-r--r--numpy/typing/tests/data/reveal/nested_sequence.pyi5
-rw-r--r--numpy/typing/tests/data/reveal/shape_base.pyi2
-rw-r--r--numpy/typing/tests/data/reveal/type_check.pyi3
-rw-r--r--numpy/typing/tests/test_generic_alias.py4
-rw-r--r--numpy/typing/tests/test_typing.py54
12 files changed, 45 insertions, 41 deletions
diff --git a/numpy/typing/tests/data/fail/array_like.pyi b/numpy/typing/tests/data/fail/array_like.pyi
index 3bbd29061..133b5fd49 100644
--- a/numpy/typing/tests/data/fail/array_like.pyi
+++ b/numpy/typing/tests/data/fail/array_like.pyi
@@ -1,5 +1,5 @@
import numpy as np
-from numpy.typing import ArrayLike
+from numpy._typing import ArrayLike
class A:
diff --git a/numpy/typing/tests/data/fail/flatiter.pyi b/numpy/typing/tests/data/fail/flatiter.pyi
index 544ffbe4a..b4ce10ba5 100644
--- a/numpy/typing/tests/data/fail/flatiter.pyi
+++ b/numpy/typing/tests/data/fail/flatiter.pyi
@@ -1,7 +1,7 @@
from typing import Any
import numpy as np
-from numpy.typing import _SupportsArray
+from numpy._typing import _SupportsArray
class Index:
diff --git a/numpy/typing/tests/data/fail/nested_sequence.pyi b/numpy/typing/tests/data/fail/nested_sequence.pyi
index c51593b1e..6301e5176 100644
--- a/numpy/typing/tests/data/fail/nested_sequence.pyi
+++ b/numpy/typing/tests/data/fail/nested_sequence.pyi
@@ -1,5 +1,5 @@
from collections.abc import Sequence
-import numpy.typing as npt
+from numpy._typing import _NestedSequence
a: Sequence[float]
b: list[complex]
@@ -7,7 +7,7 @@ c: tuple[str, ...]
d: int
e: str
-def func(a: npt._NestedSequence[int]) -> None:
+def func(a: _NestedSequence[int]) -> None:
...
reveal_type(func(a)) # E: incompatible type
diff --git a/numpy/typing/tests/data/mypy.ini b/numpy/typing/tests/data/mypy.ini
index 548f76261..baad759bb 100644
--- a/numpy/typing/tests/data/mypy.ini
+++ b/numpy/typing/tests/data/mypy.ini
@@ -1,6 +1,7 @@
[mypy]
plugins = numpy.typing.mypy_plugin
show_absolute_path = True
+implicit_reexport = False
[mypy-numpy]
ignore_errors = True
diff --git a/numpy/typing/tests/data/pass/array_like.py b/numpy/typing/tests/data/pass/array_like.py
index 4e9f8dded..da2520e96 100644
--- a/numpy/typing/tests/data/pass/array_like.py
+++ b/numpy/typing/tests/data/pass/array_like.py
@@ -3,7 +3,7 @@ from __future__ import annotations
from typing import Any
import numpy as np
-from numpy.typing import ArrayLike, _SupportsArray
+from numpy._typing import ArrayLike, _SupportsArray
x1: ArrayLike = True
x2: ArrayLike = 5
diff --git a/numpy/typing/tests/data/reveal/arithmetic.pyi b/numpy/typing/tests/data/reveal/arithmetic.pyi
index 2002727cf..a7077fcce 100644
--- a/numpy/typing/tests/data/reveal/arithmetic.pyi
+++ b/numpy/typing/tests/data/reveal/arithmetic.pyi
@@ -1,9 +1,10 @@
from typing import Any
+
import numpy as np
-import numpy.typing as npt
+from numpy._typing import _128Bit
# Can't directly import `np.float128` as it is not available on all platforms
-f16: np.floating[npt._128Bit]
+f16: np.floating[_128Bit]
c16 = np.complex128()
f8 = np.float64()
diff --git a/numpy/typing/tests/data/reveal/ndarray_misc.pyi b/numpy/typing/tests/data/reveal/ndarray_misc.pyi
index c990e2ab1..fb2989a45 100644
--- a/numpy/typing/tests/data/reveal/ndarray_misc.pyi
+++ b/numpy/typing/tests/data/reveal/ndarray_misc.pyi
@@ -11,7 +11,7 @@ import ctypes as ct
from typing import Any
import numpy as np
-from numpy.typing import NDArray
+from numpy._typing import NDArray
class SubClass(NDArray[np.object_]): ...
diff --git a/numpy/typing/tests/data/reveal/nested_sequence.pyi b/numpy/typing/tests/data/reveal/nested_sequence.pyi
index c9f91cfa2..286f75ac5 100644
--- a/numpy/typing/tests/data/reveal/nested_sequence.pyi
+++ b/numpy/typing/tests/data/reveal/nested_sequence.pyi
@@ -1,6 +1,7 @@
from collections.abc import Sequence
from typing import Any
-import numpy.typing as npt
+
+from numpy._typing import _NestedSequence
a: Sequence[int]
b: Sequence[Sequence[int]]
@@ -11,7 +12,7 @@ f: tuple[int, ...]
g: list[int]
h: Sequence[Any]
-def func(a: npt._NestedSequence[int]) -> None:
+def func(a: _NestedSequence[int]) -> None:
...
reveal_type(func(a)) # E: None
diff --git a/numpy/typing/tests/data/reveal/shape_base.pyi b/numpy/typing/tests/data/reveal/shape_base.pyi
index 70e85dd09..b907a4328 100644
--- a/numpy/typing/tests/data/reveal/shape_base.pyi
+++ b/numpy/typing/tests/data/reveal/shape_base.pyi
@@ -1,5 +1,5 @@
import numpy as np
-from numpy.typing import NDArray
+from numpy._typing import NDArray
from typing import Any
i8: np.int64
diff --git a/numpy/typing/tests/data/reveal/type_check.pyi b/numpy/typing/tests/data/reveal/type_check.pyi
index 40344905b..ddd319a94 100644
--- a/numpy/typing/tests/data/reveal/type_check.pyi
+++ b/numpy/typing/tests/data/reveal/type_check.pyi
@@ -1,5 +1,6 @@
import numpy as np
import numpy.typing as npt
+from numpy._typing import _128Bit
f8: np.float64
f: float
@@ -9,7 +10,7 @@ AR_i8: npt.NDArray[np.int64]
AR_i4: npt.NDArray[np.int32]
AR_f2: npt.NDArray[np.float16]
AR_f8: npt.NDArray[np.float64]
-AR_f16: npt.NDArray[np.floating[npt._128Bit]]
+AR_f16: npt.NDArray[np.floating[_128Bit]]
AR_c8: npt.NDArray[np.complex64]
AR_c16: npt.NDArray[np.complex128]
diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py
index 8df2eea93..52d3deae4 100644
--- a/numpy/typing/tests/test_generic_alias.py
+++ b/numpy/typing/tests/test_generic_alias.py
@@ -9,7 +9,7 @@ from typing import TypeVar, Any, Union, Callable
import pytest
import numpy as np
-from numpy.typing._generic_alias import _GenericAlias
+from numpy._typing._generic_alias import _GenericAlias
ScalarType = TypeVar("ScalarType", bound=np.generic, covariant=True)
T1 = TypeVar("T1")
@@ -38,7 +38,7 @@ def _get_subclass_mro(base: type) -> tuple[type, ...]:
class TestGenericAlias:
- """Tests for `numpy.typing._generic_alias._GenericAlias`."""
+ """Tests for `numpy._typing._generic_alias._GenericAlias`."""
@pytest.mark.parametrize("name,func", [
("__init__", lambda n: n),
diff --git a/numpy/typing/tests/test_typing.py b/numpy/typing/tests/test_typing.py
index bb3914434..5011339b5 100644
--- a/numpy/typing/tests/test_typing.py
+++ b/numpy/typing/tests/test_typing.py
@@ -228,41 +228,41 @@ def _construct_ctypes_dict() -> dict[str, str]:
def _construct_format_dict() -> dict[str, str]:
- dct = {k.split(".")[-1]: v.replace("numpy", "numpy.typing") for
+ dct = {k.split(".")[-1]: v.replace("numpy", "numpy._typing") for
k, v in _PRECISION_DICT.items()}
return {
- "uint8": "numpy.unsignedinteger[numpy.typing._8Bit]",
- "uint16": "numpy.unsignedinteger[numpy.typing._16Bit]",
- "uint32": "numpy.unsignedinteger[numpy.typing._32Bit]",
- "uint64": "numpy.unsignedinteger[numpy.typing._64Bit]",
- "uint128": "numpy.unsignedinteger[numpy.typing._128Bit]",
- "uint256": "numpy.unsignedinteger[numpy.typing._256Bit]",
- "int8": "numpy.signedinteger[numpy.typing._8Bit]",
- "int16": "numpy.signedinteger[numpy.typing._16Bit]",
- "int32": "numpy.signedinteger[numpy.typing._32Bit]",
- "int64": "numpy.signedinteger[numpy.typing._64Bit]",
- "int128": "numpy.signedinteger[numpy.typing._128Bit]",
- "int256": "numpy.signedinteger[numpy.typing._256Bit]",
- "float16": "numpy.floating[numpy.typing._16Bit]",
- "float32": "numpy.floating[numpy.typing._32Bit]",
- "float64": "numpy.floating[numpy.typing._64Bit]",
- "float80": "numpy.floating[numpy.typing._80Bit]",
- "float96": "numpy.floating[numpy.typing._96Bit]",
- "float128": "numpy.floating[numpy.typing._128Bit]",
- "float256": "numpy.floating[numpy.typing._256Bit]",
+ "uint8": "numpy.unsignedinteger[numpy._typing._8Bit]",
+ "uint16": "numpy.unsignedinteger[numpy._typing._16Bit]",
+ "uint32": "numpy.unsignedinteger[numpy._typing._32Bit]",
+ "uint64": "numpy.unsignedinteger[numpy._typing._64Bit]",
+ "uint128": "numpy.unsignedinteger[numpy._typing._128Bit]",
+ "uint256": "numpy.unsignedinteger[numpy._typing._256Bit]",
+ "int8": "numpy.signedinteger[numpy._typing._8Bit]",
+ "int16": "numpy.signedinteger[numpy._typing._16Bit]",
+ "int32": "numpy.signedinteger[numpy._typing._32Bit]",
+ "int64": "numpy.signedinteger[numpy._typing._64Bit]",
+ "int128": "numpy.signedinteger[numpy._typing._128Bit]",
+ "int256": "numpy.signedinteger[numpy._typing._256Bit]",
+ "float16": "numpy.floating[numpy._typing._16Bit]",
+ "float32": "numpy.floating[numpy._typing._32Bit]",
+ "float64": "numpy.floating[numpy._typing._64Bit]",
+ "float80": "numpy.floating[numpy._typing._80Bit]",
+ "float96": "numpy.floating[numpy._typing._96Bit]",
+ "float128": "numpy.floating[numpy._typing._128Bit]",
+ "float256": "numpy.floating[numpy._typing._256Bit]",
"complex64": ("numpy.complexfloating"
- "[numpy.typing._32Bit, numpy.typing._32Bit]"),
+ "[numpy._typing._32Bit, numpy._typing._32Bit]"),
"complex128": ("numpy.complexfloating"
- "[numpy.typing._64Bit, numpy.typing._64Bit]"),
+ "[numpy._typing._64Bit, numpy._typing._64Bit]"),
"complex160": ("numpy.complexfloating"
- "[numpy.typing._80Bit, numpy.typing._80Bit]"),
+ "[numpy._typing._80Bit, numpy._typing._80Bit]"),
"complex192": ("numpy.complexfloating"
- "[numpy.typing._96Bit, numpy.typing._96Bit]"),
+ "[numpy._typing._96Bit, numpy._typing._96Bit]"),
"complex256": ("numpy.complexfloating"
- "[numpy.typing._128Bit, numpy.typing._128Bit]"),
+ "[numpy._typing._128Bit, numpy._typing._128Bit]"),
"complex512": ("numpy.complexfloating"
- "[numpy.typing._256Bit, numpy.typing._256Bit]"),
+ "[numpy._typing._256Bit, numpy._typing._256Bit]"),
"ubyte": f"numpy.unsignedinteger[{dct['_NBitByte']}]",
"ushort": f"numpy.unsignedinteger[{dct['_NBitShort']}]",
@@ -310,7 +310,7 @@ def _parse_reveals(file: IO[str]) -> tuple[npt.NDArray[np.str_], list[str]]:
All format keys will be substituted for their respective value
from `FORMAT_DICT`, *e.g.* ``"{float64}"`` becomes
- ``"numpy.floating[numpy.typing._64Bit]"``.
+ ``"numpy.floating[numpy._typing._64Bit]"``.
"""
string = file.read().replace("*", "")
View Lorry Controller Status