Move MachineActionManager into cura.UI module

cura/CuraApplication.py

@@ -95,9 +95,8 @@ from . import CameraAnimation
 from . import PrintInformation
 from . import CuraActions
 from cura.Scene import ZOffsetDecorator
-from cura.UI import CuraSplashScreen
+from cura.UI import CuraSplashScreen, MachineActionManager
 from . import PrintJobPreviewImageProvider
-from . import MachineActionManager
 
 from cura.TaskManagement.OnExitCallbackManager import OnExitCallbackManager
 

cura/MachineActionManager.py → cura/UI/MachineActionManager.py

@@ -12,7 +12,7 @@ from UM.PluginRegistry import PluginRegistry  # So MachineAction can be added as
 if TYPE_CHECKING:
     from cura.CuraApplication import CuraApplication
     from cura.Settings.GlobalStack import GlobalStack
-    from .MachineAction import MachineAction
+    from cura.MachineAction import MachineAction
 
 
 ##  Raised when trying to add an unknown machine action as a required action

tests/TestMachineAction.py

@@ -4,7 +4,7 @@
 import pytest
 
 from cura.MachineAction import MachineAction
-from cura.MachineActionManager import NotUniqueMachineActionError, UnknownMachineActionError
+from cura.UI.MachineActionManager import NotUniqueMachineActionError, UnknownMachineActionError
 from cura.Settings.GlobalStack import GlobalStack
 
 

tests/conftest.py

@@ -6,11 +6,8 @@
 import unittest.mock
 import pytest
 
-import Arcus #Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import Arcus and Savitar first!
-import Savitar
-from UM.Qt.QtApplication import QtApplication #QtApplication import is required, even though it isn't used.
 from cura.CuraApplication import CuraApplication
-from cura.MachineActionManager import MachineActionManager
+from cura.UI.MachineActionManager import MachineActionManager
 
 
 # Create a CuraApplication object that will be shared among all tests. It needs to be initialized.