Merge pull request #11571 from Ultimaker/CURA-7924_sip_cmake_build

Cura 7924 sip cmake build

plugins/3MFReader/ThreeMFReader.py

@@ -1,11 +1,11 @@
-# Copyright (c) 2021 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
+#  Copyright (c) 2021-2022 Ultimaker B.V.
+#  Cura is released under the terms of the LGPLv3 or higher.
 
 import os.path
 import zipfile
 from typing import List, Optional, Union, TYPE_CHECKING, cast
 
-import Savitar
+import pySavitar as Savitar
 import numpy
 
 from UM.Logger import Logger
@@ -304,4 +304,4 @@ class ThreeMFReader(MeshReader):
             unit = "millimeter"
 
         scale = conversion_to_mm[unit]
-        return Vector(scale, scale, scale)
+        return Vector(scale, scale, scale)

plugins/3MFWriter/ThreeMFWriter.py

@@ -1,5 +1,5 @@
-# Copyright (c) 2015 Ultimaker B.V.
-# Uranium is released under the terms of the LGPLv3 or higher.
+#  Copyright (c) 2015-2022 Ultimaker B.V.
+#  Cura is released under the terms of the LGPLv3 or higher.
 from typing import Optional
 
 from UM.Mesh.MeshWriter import MeshWriter
@@ -15,7 +15,7 @@ from cura.Snapshot import Snapshot
 
 from PyQt6.QtCore import QBuffer
 
-import Savitar
+import pySavitar as Savitar
 
 import numpy
 import datetime

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
+#  Copyright (c) 2021-2022 Ultimaker B.V.
+#  Cura is released under the terms of the LGPLv3 or higher.
 
 import argparse #To run the engine in debug mode if the front-end is in debug mode.
 from collections import defaultdict
@@ -31,7 +31,7 @@ from cura.Utils.Threading import call_on_qt_thread
 from .ProcessSlicedLayersJob import ProcessSlicedLayersJob
 from .StartSliceJob import StartSliceJob, StartJobResult
 
-import Arcus
+import pyArcus as Arcus
 
 if TYPE_CHECKING:
     from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel

plugins/CuraEngineBackend/StartSliceJob.py

@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
+#  Copyright (c) 2021-2022 Ultimaker B.V.
+#  Cura is released under the terms of the LGPLv3 or higher.
 
 import numpy
 from string import Formatter
@@ -7,7 +7,7 @@ from enum import IntEnum
 import time
 from typing import Any, cast, Dict, List, Optional, Set
 import re
-import Arcus #For typing.
+import pyArcus as Arcus  # For typing.
 from PyQt6.QtCore import QCoreApplication
 
 from UM.Job import Job
@@ -94,7 +94,7 @@ class StartSliceJob(Job):
         super().__init__()
 
         self._scene = CuraApplication.getInstance().getController().getScene() #type: Scene
-        self._slice_message = slice_message #type: Arcus.PythonMessage
+        self._slice_message: Arcus.PythonMessage = slice_message
         self._is_cancelled = False #type: bool
         self._build_plate_number = None #type: Optional[int]
 

plugins/Marketplace/LocalPackageList.py

@@ -3,7 +3,7 @@
 
 from typing import Any, Dict, List, Optional, TYPE_CHECKING
 
-from PyQt5.QtCore import pyqtSlot, QObject
+from PyQt6.QtCore import pyqtSlot, QObject
 
 from UM.Version import Version
 from UM.i18n import i18nCatalog
@@ -15,8 +15,8 @@ from .PackageModel import PackageModel
 from .Constants import PACKAGE_UPDATES_URL
 
 if TYPE_CHECKING:
-    from PyQt5.QtCore import QObject
-    from PyQt5.QtNetwork import QNetworkReply
+    from PyQt6.QtCore import QObject
+    from PyQt6.QtNetwork import QNetworkReply
 
 catalog = i18nCatalog("cura")
 

plugins/Marketplace/Marketplace.py

@@ -2,7 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os.path
-from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
+from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
 from typing import Optional, cast
 
 from cura.CuraApplication import CuraApplication  # Creating QML objects and managing packages.

plugins/Marketplace/PackageList.py

@@ -4,7 +4,7 @@ import tempfile
 import json
 import os.path
 
-from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, Qt
+from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, Qt
 from typing import cast, Dict, Optional, Set, TYPE_CHECKING
 
 from UM.i18n import i18nCatalog
@@ -22,8 +22,8 @@ from .PackageModel import PackageModel
 from .Constants import USER_PACKAGES_URL, PACKAGES_URL
 
 if TYPE_CHECKING:
-    from PyQt5.QtCore import QObject
-    from PyQt5.QtNetwork import QNetworkReply
+    from PyQt6.QtCore import QObject
+    from PyQt6.QtNetwork import QNetworkReply
 
 catalog = i18nCatalog("cura")
 
@@ -32,7 +32,7 @@ class PackageList(ListModel):
     """ A List model for Packages, this class serves as parent class for more detailed implementations.
     such as Packages obtained from Remote or Local source
     """
-    PackageRole = Qt.UserRole + 1
+    PackageRole = Qt.ItemDataRole.UserRole + 1
     DISK_WRITE_BUFFER_SIZE = 256 * 1024  # 256 KB
 
     def __init__(self, parent: Optional["QObject"] = None) -> None:

plugins/Marketplace/PackageModel.py

@@ -5,8 +5,8 @@ import re
 from enum import Enum
 from typing import Any, cast, Dict, List, Optional
 
-from PyQt5.QtCore import pyqtProperty, QObject, pyqtSignal, pyqtSlot
-from PyQt5.QtQml import QQmlEngine
+from PyQt6.QtCore import pyqtProperty, QObject, pyqtSignal, pyqtSlot
+from PyQt6.QtQml import QQmlEngine
 
 from cura.CuraApplication import CuraApplication
 from cura.CuraPackageManager import CuraPackageManager

plugins/Marketplace/RemotePackageList.py

@@ -1,8 +1,8 @@
 #  Copyright (c) 2021 Ultimaker B.V.
 #  Cura is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot
-from PyQt5.QtNetwork import QNetworkReply
+from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot
+from PyQt6.QtNetwork import QNetworkReply
 from typing import Optional, TYPE_CHECKING
 
 from UM.i18n import i18nCatalog
@@ -14,7 +14,7 @@ from .PackageList import PackageList
 from .PackageModel import PackageModel  # The contents of this list.
 
 if TYPE_CHECKING:
-    from PyQt5.QtCore import QObject
+    from PyQt6.QtCore import QObject
 
 catalog = i18nCatalog("cura")