fix right location for matlab avail

Author: oliverchampion

conftest.py

@@ -4,7 +4,6 @@
 import csv
 # import datetime
 
-
 def pytest_addoption(parser):
     parser.addoption(
         "--SNR",
@@ -81,6 +80,22 @@ def pytest_addoption(parser):
         type=str,
         help="Drop this algorithm from the list"
     )
+    parser.addoption(
+        "--with-matlab",
+        action="store_true",
+        default=False,
+        help="Run MATLAB-dependent tests"
+    )
+
+eng = None
+
+def pytest_configure(config):
+    global eng
+    if config.getoption("--with-matlab"):
+        import matlab.engine
+        print("Starting MATLAB engine...")
+        eng = matlab.engine.start_matlab()
+        print("MATLAB engine started.")
 
 
 @pytest.fixture(scope="session")

tests/IVIMmodels/unit_tests/algorithms.json

@@ -16,7 +16,7 @@
         "OJ_GU_seg"
     ],
     "ASD_MemorialSloanKettering_QAMPER_IVIM": {
-        "requieres_matlab": true,
+        "requieres_matlab": true
     },
     "IAR_LU_biexp": {
         "fail_first_time": true

tests/IVIMmodels/unit_tests/test_ivim_fit.py

@@ -5,24 +5,10 @@
 import pathlib
 import time
 from src.wrappers.OsipiBase import OsipiBase
+from conftest import eng
 #run using python -m pytest from the root folder
 
 
-eng = None
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--with-matlab", action="store_true", default=False, help="Run MATLAB-dependent tests"
-    )
-
-@pytest.hookimpl
-def pytest_configure(config):
-    global eng
-    if config.getoption("--with-matlab"):
-        import matlab.engine
-        eng = matlab.engine.start_matlab()
-
-
 def signal_helper(signal):
     signal = np.asarray(signal)
     #signal[signal < 0] = 0.00001
@@ -72,7 +58,7 @@ def data_ivim_fit_saved():
             if first == True:
                 if algorithm_dict.get("fail_first_time", {}) == True:
                     skiptime = True
-                    first = False # this will only work for 1 algorithm... If two algorithms use fail_first_time, the second will not see it is the first time.
+                    first = False
             if algorithm_dict.get("requieres_matlab", {}) == True:
                 if eng is None:
                     continue
@@ -130,7 +116,7 @@ def algorithmlist():
             if eng is None:
                 continue
             else:
-                kwargs = {**kwargs, 'eng': eng}
+                args = {**args, 'eng': eng}
         yield algorithm, args
 
 @pytest.mark.parametrize("algorithm, args", algorithmlist())