3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Move MachineActionManager into cura.UI module

Browse source
This commit is contained in:
Lipu Fei 2019-03-20 09:10:48 +01:00
parent 8c0cb2b7b8
commit dfc53d3604
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/conftest.py
View file

@ -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.