Remove optimagic dependency from test-suite

Author: timmens

tests/test_tranquilo.py

@@ -192,15 +192,18 @@ def test_external_tranquilo_ls_sphere_defaults():
 # Noisy case
 # ======================================================================================
 
-
-@pytest.mark.skipif(not IS_OPTIMAGIC_INSTALLED, reason="optimagic is not installed.")
-@pytest.mark.parametrize(
-    "algorithm, criterion",
-    [
+if IS_OPTIMAGIC_INSTALLED:
+    # Has to be defined here to avoid import errors when optimagic is not installed
+    ALGORITHM_AND_CRITERION = [
         ("tranquilo", mark.scalar(lambda x: x @ x)),
         ("tranquilo_ls", mark.least_squares(lambda x: x)),
-    ],
-)
+    ]
+else:
+    ALGORITHM_AND_CRITERION = []
+
+
+@pytest.mark.skipif(not IS_OPTIMAGIC_INSTALLED, reason="optimagic is not installed.")
+@pytest.mark.parametrize("algorithm, criterion", ALGORITHM_AND_CRITERION)
 def test_tranquilo_with_noise_handling_and_deterministic_function(algorithm, criterion):
     res = minimize(
         fun=criterion,
@@ -238,13 +241,7 @@ def _f(x):
 
 
 @pytest.mark.skipif(not IS_OPTIMAGIC_INSTALLED, reason="optimagic is not installed.")
-@pytest.mark.parametrize(
-    "algorithm, criterion",
-    [
-        ("tranquilo", mark.scalar(lambda x: x @ x)),
-        ("tranquilo_ls", mark.least_squares(lambda x: x)),
-    ],
-)
+@pytest.mark.parametrize("algorithm, criterion", ALGORITHM_AND_CRITERION)
 def test_tranquilo_with_binding_bounds(algorithm, criterion):
     res = minimize(
         fun=criterion,

tests/test_visualize.py

@@ -7,38 +7,41 @@
     from optimagic.benchmarking.get_benchmark_problems import get_benchmark_problems
     from optimagic.optimization.optimize import minimize
 
-cases = []
-algo_options = {
-    "random_hull": {
-        "sampler": "random_hull",
-        "sphere_subsolver": "gqtpar_fast",
-        "sample_filter": "keep_all",
-        "stopping_maxiter": 10,
-    },
-    "optimal_hull": {
-        "sampler": "optimal_hull",
-        "sphere_subsolver": "gqtpar_fast",
-        "sample_filter": "keep_all",
-        "stopping_maxiter": 10,
-    },
-}
-for problem in ["rosenbrock_good_start", "watson_6_good_start"]:
-    inputs = get_benchmark_problems("more_wild")[problem]["inputs"]
-    fun = inputs["fun"]
-    start_params = inputs["params"]
-    for algorithm in ["tranquilo", "tranquilo_ls"]:
-        results = {}
-        for s, options in algo_options.items():
-            results[s] = minimize(
-                fun=fun,
-                params=start_params,
-                algo_options=options,
-                algorithm=algorithm,
-            )
-        cases.append(results)
 
+def benchmark_cases():
+    cases = []
+    algo_options = {
+        "random_hull": {
+            "sampler": "random_hull",
+            "sphere_subsolver": "gqtpar_fast",
+            "sample_filter": "keep_all",
+            "stopping_maxiter": 10,
+        },
+        "optimal_hull": {
+            "sampler": "optimal_hull",
+            "sphere_subsolver": "gqtpar_fast",
+            "sample_filter": "keep_all",
+            "stopping_maxiter": 10,
+        },
+    }
+    for problem in ["rosenbrock_good_start", "watson_6_good_start"]:
+        inputs = get_benchmark_problems("more_wild")[problem]["inputs"]
+        fun = inputs["fun"]
+        start_params = inputs["params"]
+        for algorithm in ["tranquilo", "tranquilo_ls"]:
+            results = {}
+            for s, options in algo_options.items():
+                results[s] = minimize(
+                    fun=fun,
+                    params=start_params,
+                    algo_options=options,
+                    algorithm=algorithm,
+                )
+            cases.append(results)
+    return cases
 
-@pytest.mark.parametrize("results", cases)
+
+@pytest.mark.parametrize("results", benchmark_cases() if IS_OPTIMAGIC_INSTALLED else [])
 def test_visualize_tranquilo(results):
     visualize_tranquilo(results, 5)
     for res in results.values():