Fix stubtest checks

Author: jonathanberthias

src/pyscipopt/scip.pyi

@@ -252,9 +252,9 @@ class Conshdlr:
 class Constant(GenExpr):
     number: Incomplete
     def __init__(self, *args: Incomplete, **kwargs: Incomplete) -> None: ...
-    def __pow__(
+    def __pow__(  # type: ignore[override]
         self, other: float | Constant, modulo: Incomplete = ..., /
-    ) -> Constant: ...  # type: ignore[override]
+    ) -> Constant: ...
 
 @disjoint_base
 class Constraint:
@@ -447,28 +447,26 @@ class GenExpr(ExprLike):
     @overload
     def __add__(self, other: float | ExprLike, /) -> SumExpr: ...
     @overload
-    def __add__(self, other: np.ndarray | MatrixExpr) -> MatrixExpr: ...
+    def __add__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
     def __radd__(self, other: float, /) -> SumExpr: ...
     @overload
     def __sub__(self, other: float | ExprLike, /) -> SumExpr: ...
     @overload
-    def __sub__(self, other: np.ndarray | MatrixExpr) -> MatrixExpr: ...
+    def __sub__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
     def __rsub__(self, other: float, /) -> SumExpr: ...
     @overload
     def __mul__(self, other: float | ExprLike, /) -> ProdExpr: ...
     @overload
-    def __mul__(self, other: np.ndarray | MatrixExpr) -> MatrixExpr: ...
+    def __mul__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
     def __rmul__(self, other: float, /) -> ProdExpr: ...
     @overload
     def __truediv__(self, other: float | ExprLike, /) -> ProdExpr: ...
     @overload
-    def __truediv__(self, other: np.ndarray | MatrixExpr) -> MatrixExpr: ...
+    def __truediv__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
     def __rtruediv__(self, other: float, /) -> ProdExpr: ...
     def __ne__(self, other: object, /) -> bool: ...
-    def __pow__(
-        self, other: float | Constant, modulo: Incomplete = ..., /
-    ) -> PowExpr: ...
-    def __rpow__(self, other: float, /) -> UnaryExpr: ...
+    def __pow__(self, other: float | Constant, mod: Incomplete = ..., /) -> PowExpr: ...
+    def __rpow__(self, other: float, mod: Incomplete = ..., /) -> UnaryExpr: ...
 
 @disjoint_base
 class Heur:
@@ -600,34 +598,36 @@ class MatrixExpr(np.ndarray):
     ) -> Incomplete: ...
     def __neg__(self, /) -> MatrixExpr: ...
     def __abs__(self, /) -> MatrixExpr: ...
-    def __add__(
+    def __add__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExpr: ...  # type: ignore[override]
+    ) -> MatrixExpr: ...
     def __radd__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
-    def __sub__(
+    def __sub__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExpr: ...  # type: ignore[override]
+    ) -> MatrixExpr: ...
     def __rsub__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
-    def __mul__(
+    def __mul__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExpr: ...  # type: ignore[override]
+    ) -> MatrixExpr: ...
     def __rmul__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
-    def __truediv__(
+    def __truediv__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExpr: ...  # type: ignore[override]
+    ) -> MatrixExpr: ...
     def __rtruediv__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
-    def __eq__(
+    def __eq__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExprCons: ...  # type: ignore[override]
-    def __le__(
+    ) -> MatrixExprCons: ...
+    def __le__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExprCons: ...  # type: ignore[override]
-    def __ge__(
+    ) -> MatrixExprCons: ...
+    def __ge__(  # type: ignore[override]
         self, other: float | ExprLike | np.ndarray | MatrixExpr, /
-    ) -> MatrixExprCons: ...  # type: ignore[override]
+    ) -> MatrixExprCons: ...
     def __matmul__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...  # type: ignore[override]
-    def __pow__(self, other: float | np.ndarray, /) -> MatrixExpr: ...  # type: ignore[override]
-    def __rpow__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
+    def __pow__(  # type: ignore[override]
+        self, other: float | np.ndarray, mod: Incomplete = ..., /
+    ) -> MatrixExpr: ...
+    def __rpow__(self, other: float, mod: Incomplete = ..., /) -> MatrixExpr: ...  # type: ignore[override]
 
 class MatrixExprCons(np.ndarray):
     def __array_ufunc__(

stubs/allowlist

@@ -1,3 +1,9 @@
 .*.__reduce_cython__
 .*.__setstate_cython__
 pyscipopt.scip.__test__
+# These exist at runtime but aren't useful in the stubs, they are added to the child classes
+pyscipopt.scip.ExprLike.__radd__
+pyscipopt.scip.ExprLike.__rmul__
+pyscipopt.scip.ExprLike.__rsub__
+pyscipopt.scip.ExprLike.__rtruediv__
+pyscipopt.scip.ExprLike.__sub__