fixed stuff

Author: oliverchampion

conftest.py

@@ -215,14 +215,11 @@ def data_ivim_fit_saved(datafile, algorithmFile):
             kwargs = algorithm_dict.get("options", {})
             tolerances = algorithm_dict.get("tolerances", {})
             skiptime=False
-            if first == True:
-                if algorithm_dict.get("fail_first_time", {}) == True:
+            if first:
+                if algorithm_dict.get("fail_first_time", False):
                     skiptime = True
                     first = False
-            if algorithm_dict.get("requires_matlab", False) == True:
-                requires_matlab = True
-            else:
-                requires_matlab = False
+            requires_matlab = algorithm_dict.get("requires_matlab", False)
             yield name, bvals, data, algorithm, xfail, kwargs, tolerances, skiptime, requires_matlab
 
 def algorithmlist(algorithmFile):
@@ -235,10 +232,7 @@ def algorithmlist(algorithmFile):
     algorithms = algorithm_information["algorithms"]
     for algorithm in algorithms:
         algorithm_dict = algorithm_information.get(algorithm, {})
-        if algorithm_dict.get("requires_matlab", False) == True:
-            requires_matlab = True
-        else:
-            requires_matlab = False
+        requires_matlab = algorithm_dict.get("requires_matlab", False)
         yield algorithm, requires_matlab
 
 def bound_input(datafile,algorithmFile):
@@ -261,8 +255,5 @@ def bound_input(datafile,algorithmFile):
                 "strict": algorithm_dict.get("xfail_names", {}).get(name, True)}
             kwargs = algorithm_dict.get("options", {})
             tolerances = algorithm_dict.get("tolerances", {})
-            if algorithm_dict.get("requires_matlab", False) == True:
-                requires_matlab = True
-            else:
-                requires_matlab = False
+            requires_matlab = algorithm_dict.get("requires_matlab", False)
             yield name, bvals, data, algorithm, xfail, kwargs, tolerances, requires_matlab

tests/IVIMmodels/unit_tests/test_ivim_fit.py

@@ -36,10 +36,8 @@ def test_ivim_fit_saved(data_ivim_fit_saved, eng, request, record_property):
     if requires_matlab:
         max_time = 2
         if eng is None:
-            print('test is here')
             pytest.skip(reason="Running without matlab; if Matlab is available please run pytest --withmatlab")
         else:
-            print('test is not here')
             kwargs = {**kwargs, 'eng': eng}
     if xfail["xfail"]:
         mark = pytest.mark.xfail(reason="xfail", strict=xfail["strict"])

tests/IVIMmodels/unit_tests/test_ivim_synthetic.py

@@ -17,9 +17,8 @@
 def test_generated(algorithmlist, skip_list, ivim_data, SNR, rtol, atol, fit_count, rician_noise, save_file, save_duration_file, use_prior):
     # assert save_file == "test"
     ivim_algorithm, requires_matlab = algorithmlist
-    if requires_matlab:
-        if eng is None:
-            pytest.skip(reason="Running without matlab; if Matlab is available please run pytest --withmatlab")
+    if requires_matlab and eng is None:
+        pytest.skip(reason="Running without matlab; if Matlab is available please run pytest --withmatlab")
     rng = np.random.RandomState(42)
     # random.seed(42)
     S0 = 1