Merge pull request #512 from numpy/better-ndarray-floordiv-mod-mypy-workaround

Author: jorenham

src/numpy-stubs/@test/generated/ndarray_floordiv.pyi

@@ -2551,7 +2551,11 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeT_co, _DTypeT_co]):
         self: NDArray[_RealNumberT], x: _nt.CastsWith[_RealNumberT, _RealScalarT], /
     ) -> NDArray[_RealScalarT]: ...
     @overload
-    def __floordiv__(self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[int], /) -> NDArray[_RealScalarT]: ...
+    def __floordiv__(self: NDArray[_RealNumberT], x: _nt.SequenceND[py_bool], /) -> NDArray[_RealNumberT]: ...
+    @overload
+    def __floordiv__(
+        self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[_nt.JustInt], /
+    ) -> NDArray[_RealScalarT]: ...
     @overload
     def __floordiv__(
         self: _nt.CastsWithFloat[_RealScalarT], x: _nt.SequenceND[_nt.JustFloat], /
@@ -2579,7 +2583,11 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeT_co, _DTypeT_co]):
         self: NDArray[_RealNumberT], x: _nt.CastsWith[_RealNumberT, _RealScalarT], /
     ) -> NDArray[_RealScalarT]: ...
     @overload
-    def __rfloordiv__(self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[int], /) -> NDArray[_RealScalarT]: ...
+    def __rfloordiv__(self: NDArray[_RealNumberT], x: _nt.SequenceND[py_bool], /) -> NDArray[_RealNumberT]: ...
+    @overload
+    def __rfloordiv__(
+        self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[_nt.JustInt], /
+    ) -> NDArray[_RealScalarT]: ...
     @overload
     def __rfloordiv__(
         self: _nt.CastsWithFloat[_RealScalarT], x: _nt.SequenceND[_nt.JustFloat], /
@@ -2623,7 +2631,9 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeT_co, _DTypeT_co]):
     @overload
     def __mod__(self: NDArray[_RealT], x: _nt.CastsWith[_RealT, _RealScalarT], /) -> NDArray[_RealScalarT]: ...
     @overload
-    def __mod__(self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[int], /) -> NDArray[_RealScalarT]: ...
+    def __mod__(self: NDArray[_RealNumberT], x: _nt.SequenceND[py_bool], /) -> NDArray[_RealNumberT]: ...
+    @overload
+    def __mod__(self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[_nt.JustInt], /) -> NDArray[_RealScalarT]: ...
     @overload
     def __mod__(
         self: _nt.CastsWithFloat[_RealScalarT], x: _nt.SequenceND[_nt.JustFloat], /
@@ -2643,7 +2653,9 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeT_co, _DTypeT_co]):
     @overload
     def __rmod__(self: NDArray[_RealT], x: _nt.CastsWith[_RealT, _RealScalarT], /) -> NDArray[_RealScalarT]: ...
     @overload
-    def __rmod__(self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[int], /) -> NDArray[_RealScalarT]: ...
+    def __rmod__(self: NDArray[_RealNumberT], x: _nt.SequenceND[py_bool], /) -> NDArray[_RealNumberT]: ...
+    @overload
+    def __rmod__(self: _nt.CastsWithInt[_RealScalarT], x: _nt.SequenceND[_nt.JustInt], /) -> NDArray[_RealScalarT]: ...
     @overload
     def __rmod__(
         self: _nt.CastsWithFloat[_RealScalarT], x: _nt.SequenceND[_nt.JustFloat], /

src/numpy-stubs/@test/generated/ndarray_mod.pyi

@@ -1446,7 +1446,6 @@ def _gen_testcases_binop_py_0d(
                 testcase = None
             elif (
                 (self.opname == "sub" and label_np == "b1" and name_py[0] == "b")
-                or (self.opname != "divmod" and label_np == "c16" and name_py[0] == "b")
                 or (label_np == "c16" and name_py[0] in "if")
             ):  # fmt: skip
                 testcase = "  ".join((
@@ -1524,6 +1523,11 @@ def get_testcases(self) -> Iterable[str | None]:
     NDArrayOps("floordiv"),
     NDArrayOps("mod"),
     NDArrayOps("divmod"),
+    # NDArrayOps("lshift"),
+    # NDArrayOps("rshift"),
+    # NDArrayOps("and"),
+    # NDArrayOps("xor"),
+    # NDArrayOps("or"),
 ]