Configuration Initialization moved to shiver.py

src/shiver/__init__.py

@@ -15,7 +15,6 @@
 import shiver.models.makeslice  # noqa: F401 pylint: disable=unused-import
 import shiver.models.convert_dgs_to_single_mde  # noqa: F401 pylint: disable=unused-import
 import shiver.models.generate_dgs_mde  # noqa: F401 pylint: disable=unused-import
-from shiver.configuration import Configuration
 from .version import __version__
 
 # make sure matplotlib is correctly set before we import shiver
@@ -32,17 +31,6 @@ def main():
     """
     Main entry point for Qt application
     """
-    config = Configuration()
-    if not config.is_valid():
-        msg = (
-            "Error with configuration settings!",
-            f"Check and update your file: {config.config_file_path}",
-            "with the latest settings found here:",
-            f"{config.template_file_path} and start the application again.",
-        )
-
-        print(" ".join(msg))
-        return
     app = QApplication(sys.argv)
     window = Shiver()
     window.show()

src/shiver/shiver.py

@@ -3,6 +3,7 @@
 """
 
 from qtpy.QtWidgets import QMainWindow
+from shiver.configuration import Configuration
 from shiver.version import __version__
 from shiver.views.mainwindow import MainWindow
 
@@ -19,6 +20,17 @@ def __new__(cls):
 
     def __init__(self, parent=None):
         super().__init__(parent)
+        config = Configuration()
+        if not config.is_valid():
+            msg = (
+                "Error with configuration settings!",
+                f"Check and update your file: {config.config_file_path}",
+                "with the latest settings found here:",
+                f"{config.template_file_path} and start the application again.",
+            )
+
+            print(" ".join(msg))
+            return
         self.setWindowTitle(f"SHIVER - {__version__}")
         self.main_window = MainWindow(self)
         self.setCentralWidget(self.main_window)

tests/models/test_configuration.py

@@ -4,7 +4,8 @@
 from pathlib import Path
 
 import pytest
-from shiver import main
+from qtpy.QtWidgets import QApplication
+from shiver.shiver import Shiver
 from shiver.configuration import Configuration, get_data
 
 
@@ -194,6 +195,8 @@ def test_get_data_invalid(monkeypatch, user_conf_file):
 def test_conf_init_invalid(capsys, user_conf_file, monkeypatch):
     """Test starting the app with invalid configuration"""
 
+    # initialization
+    _ = QApplication([])
     # mock conf info
     monkeypatch.setattr("shiver.configuration.CONFIG_PATH_FILE", user_conf_file)
 
@@ -202,6 +205,8 @@ def mock_is_valid(self):  # pylint: disable=unused-argument
 
     monkeypatch.setattr("shiver.configuration.Configuration.is_valid", mock_is_valid)
 
-    main()
+    shiver = Shiver()
+    shiver.show()
+
     captured = capsys.readouterr()
     assert captured[0].startswith("Error with configuration settings!")