Merge pull request #4255 from ynput/feature/OP-4634_Use-qtpy-in-tools

General: Update MacOs to PySide6

openpype/lib/applications.py

@@ -908,24 +908,25 @@ def __init__(self, application, executable, env_group=None, **data):
             self.launch_args.extend(self.data.pop("app_args"))
 
         # Handle launch environemtns
-        env = self.data.pop("env", None)
-        if env is not None and not isinstance(env, dict):
+        src_env = self.data.pop("env", None)
+        if src_env is not None and not isinstance(src_env, dict):
             self.log.warning((
                 "Passed `env` kwarg has invalid type: {}. Expected: `dict`."
                 " Using `os.environ` instead."
-            ).format(str(type(env))))
-            env = None
+            ).format(str(type(src_env))))
+            src_env = None
 
-        if env is None:
-            env = os.environ
+        if src_env is None:
+            src_env = os.environ
 
-        # subprocess.Popen keyword arguments
-        self.kwargs = {
-            "env": {
-                key: str(value)
-                for key, value in env.items()
-            }
+        ignored_env = {"QT_API", }
+        env = {
+            key: str(value)
+            for key, value in src_env.items()
+            if key not in ignored_env
         }
+        # subprocess.Popen keyword arguments
+        self.kwargs = {"env": env}
 
         if platform.system().lower() == "windows":
             # Detach new process from currently running process on Windows

openpype/modules/log_viewer/tray/widgets.py

@@ -11,7 +11,7 @@ def __init__(self, parent=None, placeholder=""):
         super(SearchComboBox, self).__init__(parent)
 
         self.setEditable(True)
-        self.setInsertPolicy(self.NoInsert)
+        self.setInsertPolicy(QtWidgets.QComboBox.NoInsert)
         self.lineEdit().setPlaceholderText(placeholder)
 
         # Apply completer settings

openpype/modules/sync_server/tray/widgets.py

@@ -156,8 +156,10 @@ def refresh(self):
         if selected_index and \
            selected_index.isValid() and \
            not self._selection_changed:
-            mode = QtCore.QItemSelectionModel.Select | \
-                QtCore.QItemSelectionModel.Rows
+            mode = (
+                QtCore.QItemSelectionModel.Select
+                | QtCore.QItemSelectionModel.Rows
+            )
             self.project_list.selectionModel().select(selected_index, mode)
 
         if self.current_project:
@@ -271,8 +273,10 @@ def _set_selection(self):
         for selected_id in self._selected_ids:
             index = self.model.get_index(selected_id)
             if index and index.isValid():
-                mode = QtCore.QItemSelectionModel.Select | \
-                    QtCore.QItemSelectionModel.Rows
+                mode = (
+                    QtCore.QItemSelectionModel.Select
+                    | QtCore.QItemSelectionModel.Rows
+                )
                 self.selection_model.select(index, mode)
                 existing_ids.add(selected_id)
 

openpype/plugins/load/copy_file.py

@@ -19,7 +19,7 @@ def load(self, context, name=None, namespace=None, data=None):
 
     @staticmethod
     def copy_file_to_clipboard(path):
-        from Qt import QtCore, QtWidgets
+        from qtpy import QtCore, QtWidgets
 
         clipboard = QtWidgets.QApplication.clipboard()
         assert clipboard, "Must have running QApplication instance"

openpype/plugins/load/copy_file_path.py

@@ -19,7 +19,7 @@ def load(self, context, name=None, namespace=None, data=None):
 
     @staticmethod
     def copy_path_to_clipboard(path):
-        from Qt import QtWidgets
+        from qtpy import QtWidgets
 
         clipboard = QtWidgets.QApplication.clipboard()
         assert clipboard, "Must have running QApplication instance"

openpype/plugins/load/delete_old_versions.py

@@ -5,7 +5,7 @@
 import clique
 from pymongo import UpdateOne
 import qargparse
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 
 from openpype import style
 from openpype.client import get_versions, get_representations

openpype/plugins/load/delivery.py

@@ -1,7 +1,7 @@
 import copy
 from collections import defaultdict
 
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from openpype.client import get_representations
 from openpype.pipeline import load, Anatomy

openpype/scripts/non_python_host_launch.py

@@ -14,7 +14,7 @@
 
 def show_error_messagebox(title, message, detail_message=None):
     """Function will show message and process ends after closing it."""
-    from Qt import QtWidgets, QtCore
+    from qtpy import QtWidgets, QtCore
     from openpype import style
 
     app = QtWidgets.QApplication([])

openpype/style/__init__.py

@@ -157,7 +157,7 @@ def _load_stylesheet():
 
 def _load_font():
     """Load and register fonts into Qt application."""
-    from Qt import QtGui
+    from qtpy import QtGui
 
     # Check if font ids are still loaded
     if _Cache.font_ids is not None:

openpype/style/color_defs.py

@@ -47,7 +47,7 @@ def create_qcolor(*args):
         *args (tuple): It is possible to pass initialization arguments for
             Qcolor.
     """
-    from Qt import QtGui
+    from qtpy import QtGui
 
     return QtGui.QColor(*args)