Merge pull request #593 from numpy/gh-592

Author: jorenham

src/numpy-stubs/@test/static/accept/numeric.pyi

@@ -22,9 +22,9 @@ AR_O: _nt.Array[np.object_]
 
 ###
 
-assert_type(np.count_nonzero(i8), int)
-assert_type(np.count_nonzero(AR_i8), int)
-assert_type(np.count_nonzero(ints), int)
+assert_type(np.count_nonzero(i8), np.intp)
+assert_type(np.count_nonzero(AR_i8), np.intp)
+assert_type(np.count_nonzero(ints), np.intp)
 assert_type(np.count_nonzero(AR_i8, keepdims=True), Any)
 assert_type(np.count_nonzero(AR_i8, axis=0), Any)
 

src/numpy-stubs/_core/_multiarray_umath.pyi

@@ -1505,7 +1505,9 @@ def interp_complex(
 ) -> np.complex128 | _nt.Array[np.complex128]: ...
 
 #
-def count_nonzero(a: object, /) -> int: ...
+def count_nonzero(a: npt.ArrayLike, /) -> np.intp: ...
+
+#
 def bincount(
     x: _nt.CoInteger_nd, /, weights: _nt.CoFloating_nd | None = None, minlength: CanIndex = 0
 ) -> _nt.Array[np.intp]: ...

src/numpy-stubs/_core/numeric.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Incomplete
 from builtins import bool as py_bool
 from collections.abc import Callable, Sequence
 from typing import (
@@ -2027,9 +2028,9 @@ def full_like(
 
 #
 @overload
-def count_nonzero(a: ArrayLike, axis: None = None, *, keepdims: L[False] = False) -> int: ...
+def count_nonzero(a: ArrayLike, axis: None = None, *, keepdims: L[False] = False) -> np.intp: ...
 @overload
-def count_nonzero(a: ArrayLike, axis: _ShapeLike | None = None, *, keepdims: py_bool = False) -> Any: ...
+def count_nonzero(a: ArrayLike, axis: _ShapeLike | None = None, *, keepdims: py_bool = False) -> Incomplete: ...
 
 #
 def flatnonzero(a: ArrayLike) -> _nt.Array1D[np.intp]: ...