3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove unneeded pycapsule imports

Browse source
This commit is contained in:
Jaime van Kessel 2021-05-10 16:53:16 +02:00
parent 08e2687c14
commit 2d396a81c5
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/DigitalLibrary/tests/conftest.py
View file

@ -1,8 +1,3 @@
# Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import custom Sip bindings first!
import Savitar # Dont remove this line
import Arcus # No really. Don't. It needs to be there!
import pynest2d # Really!
# Ensure that the importing for all tests work
import sys

4
plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py
View file

@ -1,9 +1,5 @@
from unittest.mock import patch, MagicMock
# Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import custom Sip bindings first!
import Savitar # Dont remove this line
import Arcus # No really. Don't. It needs to be there!
import pynest2d # Really!
from UM.Qt.QtApplication import QtApplication # QtApplication import is required, even though it isn't used.
import pytest

10
tests/conftest.py
View file

@ -6,12 +6,7 @@
from unittest.mock import MagicMock, patch
import pytest
# Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import custom Sip bindings first!
import Savitar # Dont remove this line
import Arcus # No really. Don't. It needs to be there!
import pynest2d # Really!
from UM.Qt.QtApplication import QtApplication # QtApplication import is required, even though it isn't used.
# Even though your IDE says these files are not used, don't believe it. It's lying. They need to be there.
from cura.CuraApplication import CuraApplication
from cura.Settings.ExtruderManager import ExtruderManager
@ -19,6 +14,7 @@ from cura.Settings.MachineManager import MachineManager
from cura.UI.MachineActionManager import MachineActionManager
from UM.Settings.ContainerRegistry import ContainerRegistry
# Create a CuraApplication object that will be shared among all tests. It needs to be initialized.
# Since we need to use it more that once, we create the application the first time and use its instance afterwards.
@pytest.fixture()
@ -26,15 +22,18 @@ def application() -> CuraApplication:
app = MagicMock()
return app
# Returns a MachineActionManager instance.
@pytest.fixture()
def machine_action_manager(application) -> MachineActionManager:
return MachineActionManager(application)
@pytest.fixture()
def global_stack():
return MagicMock(name="Global Stack")
@pytest.fixture()
def container_registry(application, global_stack) -> ContainerRegistry:
result = MagicMock()
@ -42,6 +41,7 @@ def container_registry(application, global_stack) -> ContainerRegistry:
application.getContainerRegistry = MagicMock(return_value = result)
return result
@pytest.fixture()
def extruder_manager(application, container_registry) -> ExtruderManager:
if ExtruderManager.getInstance() is not None: