Fix merge conflict artifacts in stubs and test imports

Author: Joao-Dionisio

src/pyscipopt/scip.pyi

@@ -8,8 +8,8 @@ CONST: Term
 EventNames: dict
 MAJOR: int
 MINOR: int
-PATCH: int
 Operator: Op
+PATCH: int
 PY_SCIP_CALL: Incomplete
 StageNames: dict
 TYPE_CHECKING: bool
@@ -20,18 +20,18 @@ _core_sum: Incomplete
 _expr_richcmp: Incomplete
 _is_number: Incomplete
 buildGenExprObj: Incomplete
-exp: Incomplete
-log: Incomplete
-sin: Incomplete
 cos: Incomplete
-sqrt: Incomplete
+exp: Incomplete
 expr_to_array: Incomplete
 expr_to_nodes: Incomplete
 is_memory_freed: Incomplete
+log: Incomplete
 print_memory_in_use: Incomplete
 quickprod: Incomplete
 quicksum: Incomplete
 readStatistics: Incomplete
+sin: Incomplete
+sqrt: Incomplete
 str_conversion: Incomplete
 value_to_array: Incomplete
 
@@ -346,12 +346,6 @@ class Expr(ExprLike):
     def __init__(self, terms: Incomplete = ...) -> None: ...
     def degree(self) -> Incomplete: ...
     def normalize(self) -> Incomplete: ...
-    def __add__(self, other: Incomplete) -> Incomplete: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __ge__(self, other: object) -> bool: ...
-    def __getitem__(self, index: Incomplete) -> Incomplete: ...
-    def __gt__(self, other: object) -> bool: ...
-    def __iadd__(self, other: Incomplete) -> Incomplete: ...  # noqa: PYI034
     def __abs__(self) -> Incomplete: ...
     def __add__(self, other: Incomplete, /) -> Incomplete: ...
     def __eq__(self, other: object, /) -> bool: ...

tests/test_expr.py

@@ -3,10 +3,8 @@
 import numpy as np
 import pytest
 
-from pyscipopt import Model, cos, exp, log, sin, sqrt
+from pyscipopt import Model, cos, exp, log, quickprod, sin, sqrt
 from pyscipopt.scip import CONST, Expr, ExprCons, GenExpr, MatrixGenExpr
-from pyscipopt import Model, sqrt, log, exp, sin, cos, quickprod
-from pyscipopt.scip import Expr, GenExpr, ExprCons, CONST
 
 
 @pytest.fixture(scope="module")