adaptation to new ruff version

Author: thomasWeise

moptipy/algorithms/so/ea.py

@@ -184,32 +184,32 @@ def __init__(self, op0: Op0,
             op1 = Op1()
             if br is None:
                 br = 1.0
-            elif br != 1.0:
+            elif br != 1.0:  # noqa: RUF069
                 raise ValueError(
                     f"if op1==None, br must be None or 1.0, but is {br}.")
         elif op1.__class__ is Op1:
             if br is None:
                 br = 1.0
-            elif br != 1.0:
+            elif br != 1.0:  # noqa: RUF069
                 raise ValueError(
                     f"if op1 is Op1, br must be None or 1.0, but is {br}.")
-        elif (br is not None) and (br == 1.0):
+        elif (br is not None) and (br == 1.0):  # noqa: RUF069
             op1 = Op1()
 
         if op2 is None:
             op2 = Op2()
             if br is None:
                 br = 0.0
-            elif br != 0.0:
+            elif br != 0.0:  # noqa: RUF069
                 raise ValueError(
                     f"if op2==None, br must be None or 0.0, but is {br}.")
         elif op2.__class__ is Op2:
             if br is None:
                 br = 0.0
-            elif br != 0.0:
+            elif br != 0.0:  # noqa: RUF069
                 raise ValueError(
                     f"if op2 is Op2, br must be None or 0.0, but is {br}.")
-        elif (br is not None) and (br == 0.0):
+        elif (br is not None) and (br == 0.0):  # noqa: RUF069
             op2 = Op2()
         elif (mu == 1) and (br is None):
             br = 0.0

moptipy/algorithms/so/ppa.py

@@ -305,7 +305,7 @@ def __init__(self, op0: Op0, op1: Op1WithStepSize, m: int = 30,
         self.max_step: Final[float] = max_step
 
         name = f"{name}{PART_SEPARATOR}{m}{PART_SEPARATOR}{nmax}"
-        if max_step != 1.0:
+        if max_step != 1.0:  # noqa: RUF069
             name = f"{name}{PART_SEPARATOR}{num_to_str_for_name(max_step)}"
         super().__init__(name, op0, op1)
 

tests/spaces/test_vectorspace.py

@@ -20,8 +20,8 @@ def test_vector_space_1() -> None:
     assert str(space) == "r12d"
     assert space.lower_bound_all_same
     assert space.upper_bound_all_same
-    assert all(space.lower_bound == 0.0)
-    assert all(space.upper_bound == 1.0)
+    assert all(space.lower_bound == 0.0)  # noqa: RUF069
+    assert all(space.upper_bound == 1.0)  # noqa: RUF069
 
     a = space.create()
     assert isinstance(a, np.ndarray)
@@ -79,7 +79,7 @@ def test_vector_space_2() -> None:
     assert str(space) == "r3d"
     assert not space.lower_bound_all_same
     assert space.upper_bound_all_same
-    assert all(space.upper_bound == 4.0)
+    assert all(space.upper_bound == 4.0)  # noqa: RUF069
     assert all(space.lower_bound == np.array([1.0, 2.0, 3.0]))
 
     a = space.create()
@@ -139,7 +139,7 @@ def test_vector_space_3() -> None:
     assert str(space) == "r3d"
     assert space.lower_bound_all_same
     assert not space.upper_bound_all_same
-    assert all(space.lower_bound == -1.0)
+    assert all(space.lower_bound == -1.0)  # noqa: RUF069
     assert all(space.upper_bound == np.array([4.0, 2.3, 7.0]))
 
     a = space.create()