TST: Update the pre-existing tests

7 files changed, 154 insertions, 158 deletions

diff --git a/numpy/typing/tests/data/fail/bitwise_ops.py b/numpy/typing/tests/data/fail/bitwise_ops.py
index 3b5be95c0..8a8f89755 100644
--- a/numpy/typing/tests/data/fail/bitwise_ops.py
+++ b/numpy/typing/tests/data/fail/bitwise_ops.py
@@ -9,9 +9,9 @@ i = int()
 f8 = np.float64()
 
 b_ >> f8  # E: No overload variant
-i8 << f8  # E: incompatible type
+i8 << f8  # E: No overload variant
 i | f8  # E: Unsupported operand types
-i8 ^ f8  # E: incompatible type
+i8 ^ f8  # E: No overload variant
 u8 & f8  # E: No overload variant
 ~f8  # E: Unsupported operand type
 
diff --git a/numpy/typing/tests/data/fail/numerictypes.py b/numpy/typing/tests/data/fail/numerictypes.py
index dd03eacc1..94537a23b 100644
--- a/numpy/typing/tests/data/fail/numerictypes.py
+++ b/numpy/typing/tests/data/fail/numerictypes.py
@@ -10,4 +10,4 @@ np.issubsctype(1, np.int64)  # E: incompatible type "int"
 
 np.issubdtype(1, np.int64)  # E: incompatible type "int"
 
-np.find_common_type(np.int64, np.int64)  # E: incompatible type "Type[int64]"
+np.find_common_type(np.int64, np.int64)  # E: incompatible type "Type[signedinteger[Any]]"
diff --git a/numpy/typing/tests/data/fail/scalars.py b/numpy/typing/tests/data/fail/scalars.py
index 13bb45483..e7c4c7485 100644
--- a/numpy/typing/tests/data/fail/scalars.py
+++ b/numpy/typing/tests/data/fail/scalars.py
@@ -47,11 +47,7 @@ np.void("test")  # E: incompatible type
 np.generic(1)  # E: Cannot instantiate abstract class
 np.number(1)  # E: Cannot instantiate abstract class
 np.integer(1)  # E: Cannot instantiate abstract class
-np.signedinteger(1)  # E: Cannot instantiate abstract class
-np.unsignedinteger(1)  # E: Cannot instantiate abstract class
 np.inexact(1)  # E: Cannot instantiate abstract class
-np.floating(1)  # E: Cannot instantiate abstract class
-np.complexfloating(1)  # E: Cannot instantiate abstract class
 np.character("test")  # E: Cannot instantiate abstract class
 np.flexible(b"test")  # E: Cannot instantiate abstract class
 
diff --git a/numpy/typing/tests/data/reveal/array_constructors.py b/numpy/typing/tests/data/reveal/array_constructors.py
index ba8a8eda1..13a04777f 100644
--- a/numpy/typing/tests/data/reveal/array_constructors.py
+++ b/numpy/typing/tests/data/reveal/array_constructors.py
@@ -37,6 +37,6 @@ reveal_type(np.require(B, requirements="A"))  # E: SubClass
 reveal_type(np.require(C))  # E: ndarray
 
 reveal_type(np.linspace(0, 10))  # E: numpy.ndarray
-reveal_type(np.linspace(0, 10, retstep=True))  # E: Tuple[numpy.ndarray, numpy.inexact]
+reveal_type(np.linspace(0, 10, retstep=True))  # E: Tuple[numpy.ndarray, numpy.inexact[Any]]
 reveal_type(np.logspace(0, 10))  # E: numpy.ndarray
 reveal_type(np.geomspace(1, 10))  # E: numpy.ndarray
diff --git a/numpy/typing/tests/data/reveal/fromnumeric.py b/numpy/typing/tests/data/reveal/fromnumeric.py
index 06501f6e2..75865c285 100644
--- a/numpy/typing/tests/data/reveal/fromnumeric.py
+++ b/numpy/typing/tests/data/reveal/fromnumeric.py
@@ -13,7 +13,7 @@ c = 1.0
 d = np.array(1.0, dtype=np.float32)  # writeable
 
 reveal_type(np.take(a, 0))  # E: numpy.bool_
-reveal_type(np.take(b, 0))  # E: numpy.float32
+reveal_type(np.take(b, 0))  # E: numpy.floating[numpy.typing._32Bit]
 reveal_type(
     np.take(c, 0)  # E: Union[numpy.generic, datetime.datetime, datetime.timedelta]
 )
@@ -66,8 +66,8 @@ reveal_type(np.partition(c, 0, axis=None))  # E: numpy.ndarray
 reveal_type(np.partition(A, 0))  # E: numpy.ndarray
 reveal_type(np.partition(B, 0))  # E: numpy.ndarray
 
-reveal_type(np.argpartition(a, 0))  # E: numpy.integer
-reveal_type(np.argpartition(b, 0))  # E: numpy.integer
+reveal_type(np.argpartition(a, 0))  # E: numpy.integer[Any]
+reveal_type(np.argpartition(b, 0))  # E: numpy.integer[Any]
 reveal_type(np.argpartition(c, 0))  # E: numpy.ndarray
 reveal_type(np.argpartition(A, 0))  # E: numpy.ndarray
 reveal_type(np.argpartition(B, 0))  # E: numpy.ndarray
@@ -78,18 +78,18 @@ reveal_type(np.sort(B, 0))  # E: numpy.ndarray
 reveal_type(np.argsort(A, 0))  # E: numpy.ndarray
 reveal_type(np.argsort(B, 0))  # E: numpy.ndarray
 
-reveal_type(np.argmax(A))  # E: numpy.integer
-reveal_type(np.argmax(B))  # E: numpy.integer
-reveal_type(np.argmax(A, axis=0))  # E: Union[numpy.integer, numpy.ndarray]
-reveal_type(np.argmax(B, axis=0))  # E: Union[numpy.integer, numpy.ndarray]
+reveal_type(np.argmax(A))  # E: numpy.integer[Any]
+reveal_type(np.argmax(B))  # E: numpy.integer[Any]
+reveal_type(np.argmax(A, axis=0))  # E: Union[numpy.integer[Any], numpy.ndarray]
+reveal_type(np.argmax(B, axis=0))  # E: Union[numpy.integer[Any], numpy.ndarray]
 
-reveal_type(np.argmin(A))  # E: numpy.integer
-reveal_type(np.argmin(B))  # E: numpy.integer
-reveal_type(np.argmin(A, axis=0))  # E: Union[numpy.integer, numpy.ndarray]
-reveal_type(np.argmin(B, axis=0))  # E: Union[numpy.integer, numpy.ndarray]
+reveal_type(np.argmin(A))  # E: numpy.integer[Any]
+reveal_type(np.argmin(B))  # E: numpy.integer[Any]
+reveal_type(np.argmin(A, axis=0))  # E: Union[numpy.integer[Any], numpy.ndarray]
+reveal_type(np.argmin(B, axis=0))  # E: Union[numpy.integer[Any], numpy.ndarray]
 
-reveal_type(np.searchsorted(A[0], 0))  # E: numpy.integer
-reveal_type(np.searchsorted(B[0], 0))  # E: numpy.integer
+reveal_type(np.searchsorted(A[0], 0))  # E: numpy.integer[Any]
+reveal_type(np.searchsorted(B[0], 0))  # E: numpy.integer[Any]
 reveal_type(np.searchsorted(A[0], [0]))  # E: numpy.ndarray
 reveal_type(np.searchsorted(B[0], [0]))  # E: numpy.ndarray
 
@@ -100,7 +100,7 @@ reveal_type(np.resize(A, (5, 5)))  # E: numpy.ndarray
 reveal_type(np.resize(B, (5, 5)))  # E: numpy.ndarray
 
 reveal_type(np.squeeze(a))  # E: numpy.bool_
-reveal_type(np.squeeze(b))  # E: numpy.float32
+reveal_type(np.squeeze(b))  # E: numpy.floating[numpy.typing._32Bit]
 reveal_type(np.squeeze(c))  # E: numpy.ndarray
 reveal_type(np.squeeze(A))  # E: numpy.ndarray
 reveal_type(np.squeeze(B))  # E: numpy.ndarray
@@ -108,8 +108,8 @@ reveal_type(np.squeeze(B))  # E: numpy.ndarray
 reveal_type(np.diagonal(A))  # E: numpy.ndarray
 reveal_type(np.diagonal(B))  # E: numpy.ndarray
 
-reveal_type(np.trace(A))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.trace(B))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.trace(A))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.trace(B))  # E: Union[numpy.number[Any], numpy.ndarray]
 
 reveal_type(np.ravel(a))  # E: numpy.ndarray
 reveal_type(np.ravel(b))  # E: numpy.ndarray
@@ -135,19 +135,19 @@ reveal_type(np.compress([True], c))  # E: numpy.ndarray
 reveal_type(np.compress([True], A))  # E: numpy.ndarray
 reveal_type(np.compress([True], B))  # E: numpy.ndarray
 
-reveal_type(np.clip(a, 0, 1.0))  # E: numpy.number
-reveal_type(np.clip(b, -1, 1))  # E: numpy.float32
-reveal_type(np.clip(c, 0, 1))  # E: numpy.number
-reveal_type(np.clip(A, 0, 1))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.clip(B, 0, 1))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.clip(a, 0, 1.0))  # E: numpy.number[Any]
+reveal_type(np.clip(b, -1, 1))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.clip(c, 0, 1))  # E: numpy.number[Any]
+reveal_type(np.clip(A, 0, 1))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.clip(B, 0, 1))  # E: Union[numpy.number[Any], numpy.ndarray]
 
-reveal_type(np.sum(a))  # E: numpy.number
-reveal_type(np.sum(b))  # E: numpy.float32
-reveal_type(np.sum(c))  # E: numpy.number
-reveal_type(np.sum(A))  # E: numpy.number
-reveal_type(np.sum(B))  # E: numpy.number
-reveal_type(np.sum(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.sum(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.sum(a))  # E: numpy.number[Any]
+reveal_type(np.sum(b))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.sum(c))  # E: numpy.number[Any]
+reveal_type(np.sum(A))  # E: numpy.number[Any]
+reveal_type(np.sum(B))  # E: numpy.number[Any]
+reveal_type(np.sum(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.sum(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
 
 reveal_type(np.all(a))  # E: numpy.bool_
 reveal_type(np.all(b))  # E: numpy.bool_
@@ -175,45 +175,45 @@ reveal_type(np.cumsum(c))  # E: numpy.ndarray
 reveal_type(np.cumsum(A))  # E: numpy.ndarray
 reveal_type(np.cumsum(B))  # E: numpy.ndarray
 
-reveal_type(np.ptp(a))  # E: numpy.number
-reveal_type(np.ptp(b))  # E: numpy.float32
-reveal_type(np.ptp(c))  # E: numpy.number
-reveal_type(np.ptp(A))  # E: numpy.number
-reveal_type(np.ptp(B))  # E: numpy.number
-reveal_type(np.ptp(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.ptp(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.ptp(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.ptp(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-
-reveal_type(np.amax(a))  # E: numpy.number
-reveal_type(np.amax(b))  # E: numpy.float32
-reveal_type(np.amax(c))  # E: numpy.number
-reveal_type(np.amax(A))  # E: numpy.number
-reveal_type(np.amax(B))  # E: numpy.number
-reveal_type(np.amax(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.amax(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.amax(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.amax(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-
-reveal_type(np.amin(a))  # E: numpy.number
-reveal_type(np.amin(b))  # E: numpy.float32
-reveal_type(np.amin(c))  # E: numpy.number
-reveal_type(np.amin(A))  # E: numpy.number
-reveal_type(np.amin(B))  # E: numpy.number
-reveal_type(np.amin(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.amin(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.amin(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.amin(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-
-reveal_type(np.prod(a))  # E: numpy.number
-reveal_type(np.prod(b))  # E: numpy.float32
-reveal_type(np.prod(c))  # E: numpy.number
-reveal_type(np.prod(A))  # E: numpy.number
-reveal_type(np.prod(B))  # E: numpy.number
-reveal_type(np.prod(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.prod(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.prod(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.prod(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.ptp(a))  # E: numpy.number[Any]
+reveal_type(np.ptp(b))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.ptp(c))  # E: numpy.number[Any]
+reveal_type(np.ptp(A))  # E: numpy.number[Any]
+reveal_type(np.ptp(B))  # E: numpy.number[Any]
+reveal_type(np.ptp(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.ptp(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.ptp(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.ptp(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+
+reveal_type(np.amax(a))  # E: numpy.number[Any]
+reveal_type(np.amax(b))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.amax(c))  # E: numpy.number[Any]
+reveal_type(np.amax(A))  # E: numpy.number[Any]
+reveal_type(np.amax(B))  # E: numpy.number[Any]
+reveal_type(np.amax(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.amax(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.amax(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.amax(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+
+reveal_type(np.amin(a))  # E: numpy.number[Any]
+reveal_type(np.amin(b))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.amin(c))  # E: numpy.number[Any]
+reveal_type(np.amin(A))  # E: numpy.number[Any]
+reveal_type(np.amin(B))  # E: numpy.number[Any]
+reveal_type(np.amin(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.amin(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.amin(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.amin(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+
+reveal_type(np.prod(a))  # E: numpy.number[Any]
+reveal_type(np.prod(b))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.prod(c))  # E: numpy.number[Any]
+reveal_type(np.prod(A))  # E: numpy.number[Any]
+reveal_type(np.prod(B))  # E: numpy.number[Any]
+reveal_type(np.prod(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.prod(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.prod(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.prod(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(np.prod(b, out=d))  # E: numpy.ndarray
 reveal_type(np.prod(B, out=d))  # E: numpy.ndarray
 
@@ -235,44 +235,44 @@ reveal_type(np.size(c))  # E: int
 reveal_type(np.size(A))  # E: int
 reveal_type(np.size(B))  # E: int
 
-reveal_type(np.around(a))  # E: numpy.number
-reveal_type(np.around(b))  # E: numpy.float32
-reveal_type(np.around(c))  # E: numpy.number
+reveal_type(np.around(a))  # E: numpy.number[Any]
+reveal_type(np.around(b))  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.around(c))  # E: numpy.number[Any]
 reveal_type(np.around(A))  # E: numpy.ndarray
 reveal_type(np.around(B))  # E: numpy.ndarray
 
-reveal_type(np.mean(a))  # E: numpy.number
-reveal_type(np.mean(b))  # E: numpy.number
-reveal_type(np.mean(c))  # E: numpy.number
-reveal_type(np.mean(A))  # E: numpy.number
-reveal_type(np.mean(B))  # E: numpy.number
-reveal_type(np.mean(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.mean(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.mean(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.mean(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.mean(a))  # E: numpy.number[Any]
+reveal_type(np.mean(b))  # E: numpy.number[Any]
+reveal_type(np.mean(c))  # E: numpy.number[Any]
+reveal_type(np.mean(A))  # E: numpy.number[Any]
+reveal_type(np.mean(B))  # E: numpy.number[Any]
+reveal_type(np.mean(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.mean(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.mean(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.mean(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(np.mean(b, out=d))  # E: numpy.ndarray
 reveal_type(np.mean(B, out=d))  # E: numpy.ndarray
 
-reveal_type(np.std(a))  # E: numpy.number
-reveal_type(np.std(b))  # E: numpy.number
-reveal_type(np.std(c))  # E: numpy.number
-reveal_type(np.std(A))  # E: numpy.number
-reveal_type(np.std(B))  # E: numpy.number
-reveal_type(np.std(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.std(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.std(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.std(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.std(a))  # E: numpy.number[Any]
+reveal_type(np.std(b))  # E: numpy.number[Any]
+reveal_type(np.std(c))  # E: numpy.number[Any]
+reveal_type(np.std(A))  # E: numpy.number[Any]
+reveal_type(np.std(B))  # E: numpy.number[Any]
+reveal_type(np.std(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.std(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.std(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.std(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(np.std(b, out=d))  # E: numpy.ndarray
 reveal_type(np.std(B, out=d))  # E: numpy.ndarray
 
-reveal_type(np.var(a))  # E: numpy.number
-reveal_type(np.var(b))  # E: numpy.number
-reveal_type(np.var(c))  # E: numpy.number
-reveal_type(np.var(A))  # E: numpy.number
-reveal_type(np.var(B))  # E: numpy.number
-reveal_type(np.var(A, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.var(B, axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.var(A, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(np.var(B, keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(np.var(a))  # E: numpy.number[Any]
+reveal_type(np.var(b))  # E: numpy.number[Any]
+reveal_type(np.var(c))  # E: numpy.number[Any]
+reveal_type(np.var(A))  # E: numpy.number[Any]
+reveal_type(np.var(B))  # E: numpy.number[Any]
+reveal_type(np.var(A, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.var(B, axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.var(A, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(np.var(B, keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(np.var(b, out=d))  # E: numpy.ndarray
 reveal_type(np.var(B, out=d))  # E: numpy.ndarray
diff --git a/numpy/typing/tests/data/reveal/ndarray_misc.py b/numpy/typing/tests/data/reveal/ndarray_misc.py
index 22a4564df..826c8aaa6 100644
--- a/numpy/typing/tests/data/reveal/ndarray_misc.py
+++ b/numpy/typing/tests/data/reveal/ndarray_misc.py
@@ -26,14 +26,14 @@ reveal_type(A.any(axis=0))  # E: Union[numpy.bool_, numpy.ndarray]
 reveal_type(A.any(keepdims=True))  # E: Union[numpy.bool_, numpy.ndarray]
 reveal_type(A.any(out=B))  # E: SubClass
 
-reveal_type(f8.argmax())  # E: numpy.signedinteger
-reveal_type(A.argmax())  # E: numpy.signedinteger
-reveal_type(A.argmax(axis=0))  # E: Union[numpy.signedinteger, numpy.ndarray]
+reveal_type(f8.argmax())  # E: numpy.signedinteger[Any]
+reveal_type(A.argmax())  # E: numpy.signedinteger[Any]
+reveal_type(A.argmax(axis=0))  # E: Union[numpy.signedinteger[Any], numpy.ndarray]
 reveal_type(A.argmax(out=B))  # E: SubClass
 
-reveal_type(f8.argmin())  # E: numpy.signedinteger
-reveal_type(A.argmin())  # E: numpy.signedinteger
-reveal_type(A.argmin(axis=0))  # E: Union[numpy.signedinteger, numpy.ndarray]
+reveal_type(f8.argmin())  # E: numpy.signedinteger[Any]
+reveal_type(A.argmin())  # E: numpy.signedinteger[Any]
+reveal_type(A.argmin(axis=0))  # E: Union[numpy.signedinteger[Any], numpy.ndarray]
 reveal_type(A.argmin(out=B))  # E: SubClass
 
 reveal_type(f8.argsort())  # E: numpy.ndarray
@@ -43,9 +43,9 @@ reveal_type(f8.astype(np.int64).choose([()]))  # E: numpy.ndarray
 reveal_type(A.choose([0]))  # E: numpy.ndarray
 reveal_type(A.choose([0], out=B))  # E: SubClass
 
-reveal_type(f8.clip(1))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.clip(1))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.clip(None, 1))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.clip(1))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.clip(1))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.clip(None, 1))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.clip(1, out=B))  # E: SubClass
 reveal_type(A.clip(None, 1, out=B))  # E: SubClass
 
@@ -53,11 +53,11 @@ reveal_type(f8.compress([0]))  # E: numpy.ndarray
 reveal_type(A.compress([0]))  # E: numpy.ndarray
 reveal_type(A.compress([0], out=B))  # E: SubClass
 
-reveal_type(f8.conj())  # E: numpy.float64
+reveal_type(f8.conj())  # E: numpy.floating[numpy.typing._64Bit]
 reveal_type(A.conj())  # E: numpy.ndarray
 reveal_type(B.conj())  # E: SubClass
 
-reveal_type(f8.conjugate())  # E: numpy.float64
+reveal_type(f8.conjugate())  # E: numpy.floating[numpy.typing._64Bit]
 reveal_type(A.conjugate())  # E: numpy.ndarray
 reveal_type(B.conjugate())  # E: SubClass
 
@@ -69,41 +69,41 @@ reveal_type(f8.cumsum())  # E: numpy.ndarray
 reveal_type(A.cumsum())  # E: numpy.ndarray
 reveal_type(A.cumsum(out=B))  # E: SubClass
 
-reveal_type(f8.max())  # E: numpy.number
-reveal_type(A.max())  # E: numpy.number
-reveal_type(A.max(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.max(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.max())  # E: numpy.number[Any]
+reveal_type(A.max())  # E: numpy.number[Any]
+reveal_type(A.max(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.max(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.max(out=B))  # E: SubClass
 
-reveal_type(f8.mean())  # E: numpy.number
-reveal_type(A.mean())  # E: numpy.number
-reveal_type(A.mean(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.mean(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.mean())  # E: numpy.number[Any]
+reveal_type(A.mean())  # E: numpy.number[Any]
+reveal_type(A.mean(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.mean(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.mean(out=B))  # E: SubClass
 
-reveal_type(f8.min())  # E: numpy.number
-reveal_type(A.min())  # E: numpy.number
-reveal_type(A.min(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.min(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.min())  # E: numpy.number[Any]
+reveal_type(A.min())  # E: numpy.number[Any]
+reveal_type(A.min(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.min(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.min(out=B))  # E: SubClass
 
-reveal_type(f8.newbyteorder())  # E: numpy.float64
+reveal_type(f8.newbyteorder())  # E: numpy.floating[numpy.typing._64Bit]
 reveal_type(A.newbyteorder())  # E: numpy.ndarray
 reveal_type(B.newbyteorder('|'))  # E: SubClass
 
-reveal_type(f8.prod())  # E: numpy.number
-reveal_type(A.prod())  # E: numpy.number
-reveal_type(A.prod(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.prod(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.prod())  # E: numpy.number[Any]
+reveal_type(A.prod())  # E: numpy.number[Any]
+reveal_type(A.prod(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.prod(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.prod(out=B))  # E: SubClass
 
-reveal_type(f8.ptp())  # E: numpy.number
-reveal_type(A.ptp())  # E: numpy.number
-reveal_type(A.ptp(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.ptp(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.ptp())  # E: numpy.number[Any]
+reveal_type(A.ptp())  # E: numpy.number[Any]
+reveal_type(A.ptp(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.ptp(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.ptp(out=B))  # E: SubClass
 
-reveal_type(f8.round())  # E: numpy.float64
+reveal_type(f8.round())  # E: numpy.floating[numpy.typing._64Bit]
 reveal_type(A.round())  # E: numpy.ndarray
 reveal_type(A.round(out=B))  # E: SubClass
 
@@ -111,16 +111,16 @@ reveal_type(f8.repeat(1))  # E: numpy.ndarray
 reveal_type(A.repeat(1))  # E: numpy.ndarray
 reveal_type(B.repeat(1))  # E: numpy.ndarray
 
-reveal_type(f8.std())  # E: numpy.number
-reveal_type(A.std())  # E: numpy.number
-reveal_type(A.std(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.std(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.std())  # E: numpy.number[Any]
+reveal_type(A.std())  # E: numpy.number[Any]
+reveal_type(A.std(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.std(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.std(out=B))  # E: SubClass
 
-reveal_type(f8.sum())  # E: numpy.number
-reveal_type(A.sum())  # E: numpy.number
-reveal_type(A.sum(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.sum(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.sum())  # E: numpy.number[Any]
+reveal_type(A.sum())  # E: numpy.number[Any]
+reveal_type(A.sum(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.sum(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.sum(out=B))  # E: SubClass
 
 reveal_type(f8.take(0))  # E: numpy.generic
@@ -129,22 +129,22 @@ reveal_type(A.take([0]))  # E: numpy.ndarray
 reveal_type(A.take(0, out=B))  # E: SubClass
 reveal_type(A.take([0], out=B))  # E: SubClass
 
-reveal_type(f8.var())  # E: numpy.number
-reveal_type(A.var())  # E: numpy.number
-reveal_type(A.var(axis=0))  # E: Union[numpy.number, numpy.ndarray]
-reveal_type(A.var(keepdims=True))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(f8.var())  # E: numpy.number[Any]
+reveal_type(A.var())  # E: numpy.number[Any]
+reveal_type(A.var(axis=0))  # E: Union[numpy.number[Any], numpy.ndarray]
+reveal_type(A.var(keepdims=True))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.var(out=B))  # E: SubClass
 
 reveal_type(A.argpartition([0]))  # E: numpy.ndarray
 
 reveal_type(A.diagonal())  # E: numpy.ndarray
 
-reveal_type(A.dot(1))  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(A.dot(1))  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.dot(1, out=B))  # E: SubClass
 
 reveal_type(A.nonzero())  # E: tuple[numpy.ndarray]
 
 reveal_type(A.searchsorted([1]))  # E: numpy.ndarray
 
-reveal_type(A.trace())  # E: Union[numpy.number, numpy.ndarray]
+reveal_type(A.trace())  # E: Union[numpy.number[Any], numpy.ndarray]
 reveal_type(A.trace(out=B))  # E: SubClass
diff --git a/numpy/typing/tests/data/reveal/scalars.py b/numpy/typing/tests/data/reveal/scalars.py
index 0168ebed8..72a3e4d2e 100644
--- a/numpy/typing/tests/data/reveal/scalars.py
+++ b/numpy/typing/tests/data/reveal/scalars.py
@@ -2,18 +2,18 @@ import numpy as np
 
 x = np.complex64(3 + 2j)
 
-reveal_type(x.real)  # E: numpy.float32
-reveal_type(x.imag)  # E: numpy.float32
+reveal_type(x.real)  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(x.imag)  # E: numpy.floating[numpy.typing._32Bit]
 
-reveal_type(x.real.real)  # E: numpy.float32
-reveal_type(x.real.imag)  # E: numpy.float32
+reveal_type(x.real.real)  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(x.real.imag)  # E: numpy.floating[numpy.typing._32Bit]
 
 reveal_type(x.itemsize)  # E: int
 reveal_type(x.shape)  # E: tuple[builtins.int]
 reveal_type(x.strides)  # E: tuple[builtins.int]
 
-reveal_type(np.complex64().real)  # E: numpy.float32
-reveal_type(np.complex128().imag)  # E: numpy.float64
+reveal_type(np.complex64().real)  # E: numpy.floating[numpy.typing._32Bit]
+reveal_type(np.complex128().imag)  # E: numpy.floating[numpy.typing._64Bit]
 
 reveal_type(np.unicode_('foo'))  # E: numpy.str_
 reveal_type(np.str0('foo'))  # E: numpy.str_