jchanvfx#244

Migrated code base to use QtPy libary than qt.py for Qt compatibility layer

Author: bakkiaraj

Diff for: NodeGraphQt/base/commands.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 from NodeGraphQt.constants import IN_PORT, OUT_PORT
 

Diff for: NodeGraphQt/base/graph.py

@@ -5,7 +5,7 @@
 import os
 import re
 
-from Qt import QtCore, QtWidgets, QtGui
+from qtpy import QtCore, QtWidgets, QtGui
 
 from NodeGraphQt.base.commands import (NodeAddedCmd,
                                        NodeRemovedCmd,

Diff for: NodeGraphQt/base/graph_actions.py

@@ -7,7 +7,7 @@ def build_context_menu(graph):
     Args:
         graph (NodeGraphQt.NodeGraph): node graph controller.
     """
-    from Qt import QtGui, QtCore
+    from qtpy import QtGui, QtCore
     graph_menu = graph.get_context_menu('graph')
 
     # "File" menu.

Diff for: NodeGraphQt/base/menu.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from Qt import QtGui, QtCore
+from qtpy import QtGui, QtCore
 
 from NodeGraphQt.errors import NodeMenuError
 from NodeGraphQt.widgets.actions import BaseMenu, GraphAction, NodeAction

Diff for: NodeGraphQt/constants.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 from .pkg_info import __version__
 

Diff for: NodeGraphQt/custom_widgets/nodes_palette.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict
 
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import URN_SCHEME
 

Diff for: NodeGraphQt/custom_widgets/nodes_tree.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import URN_SCHEME
 

Diff for: NodeGraphQt/custom_widgets/properties.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from collections import defaultdict
 
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import (NODE_PROP_QLABEL,
                                    NODE_PROP_QLINEEDIT,

Diff for: NodeGraphQt/custom_widgets/properties_bin.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets, QtCore, QtGui, QtCompat
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.custom_widgets.properties import NodePropWidget
 
@@ -51,9 +51,9 @@ def __init__(self, parent=None):
         self.verticalHeader().hide()
         self.horizontalHeader().hide()
 
-        QtCompat.QHeaderView.setSectionResizeMode(
+        QtWidgets.QHeaderView.setSectionResizeMode(
             self.verticalHeader(), QtWidgets.QHeaderView.ResizeToContents)
-        QtCompat.QHeaderView.setSectionResizeMode(
+        QtWidgets.QHeaderView.setSectionResizeMode(
             self.horizontalHeader(), 0, QtWidgets.QHeaderView.Stretch)
         self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
 

Diff for: NodeGraphQt/qgraphics/node_abstract.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.constants import (Z_VAL_NODE,
                                    NODE_WIDTH,

Diff for: NodeGraphQt/qgraphics/node_backdrop.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import (Z_VAL_PIPE,
                                    NODE_SEL_COLOR,

Diff for: NodeGraphQt/qgraphics/node_base.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from collections import OrderedDict
 
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import (IN_PORT, OUT_PORT,
                                    NODE_WIDTH, NODE_HEIGHT,

Diff for: NodeGraphQt/qgraphics/node_group.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import (NODE_SEL_BORDER_COLOR,
                                    NODE_SEL_COLOR,

Diff for: NodeGraphQt/qgraphics/node_overlay_disabled.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_NODE_WIDGET
 

Diff for: NodeGraphQt/qgraphics/node_port_in.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import (NODE_SEL_BORDER_COLOR, NODE_SEL_COLOR)
 from NodeGraphQt.qgraphics.node_base import NodeItem, NodeItemVertical

Diff for: NodeGraphQt/qgraphics/node_port_out.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import (NODE_SEL_BORDER_COLOR, NODE_SEL_COLOR)
 from NodeGraphQt.qgraphics.node_base import NodeItem, NodeItemVertical

Diff for: NodeGraphQt/qgraphics/node_text_item.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 
 class NodeTextItem(QtWidgets.QGraphicsTextItem):

Diff for: NodeGraphQt/qgraphics/pipe.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import math
 
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import (
     PIPE_DEFAULT_COLOR, PIPE_ACTIVE_COLOR,

Diff for: NodeGraphQt/qgraphics/port.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import (
     IN_PORT, OUT_PORT,

Diff for: NodeGraphQt/qgraphics/slicer.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import math
 
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_NODE_WIDGET, PIPE_SLICER_COLOR
 

Diff for: NodeGraphQt/widgets/actions.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.constants import VIEWER_BG_COLOR
 

Diff for: NodeGraphQt/widgets/dialogs.py

@@ -1,6 +1,6 @@
 import os
 
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 _current_user_directory = os.path.expanduser('~')
 

Diff for: NodeGraphQt/widgets/node_graph.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtGui
+from qtpy import QtWidgets, QtGui
 
 from NodeGraphQt.constants import (
     NODE_SEL_BORDER_COLOR,

Diff for: NodeGraphQt/widgets/node_widgets.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.constants import VIEWER_GRID_COLOR, Z_VAL_NODE_WIDGET
 from NodeGraphQt.errors import NodeWidgetError

Diff for: NodeGraphQt/widgets/scene.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import (VIEWER_BG_COLOR,
                                    VIEWER_GRID_SIZE,

Diff for: NodeGraphQt/widgets/tab_search.py

@@ -2,7 +2,7 @@
 import re
 from collections import OrderedDict
 
-from Qt import QtCore, QtWidgets, QtGui
+from qtpy import QtCore, QtWidgets, QtGui
 
 from NodeGraphQt.constants import (
     VIEWER_BG_COLOR,

Diff for: NodeGraphQt/widgets/viewer.py

@@ -3,7 +3,7 @@
 import math
 from distutils.version import LooseVersion
 
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.base.menu import BaseMenu
 from NodeGraphQt.constants import IN_PORT, OUT_PORT, PIPE_LAYOUT_CURVED

Diff for: NodeGraphQt/widgets/viewer_nav.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import (
     NODE_SEL_BORDER_COLOR,

Diff for: basic_example.py

@@ -3,7 +3,7 @@
 import os
 import signal
 
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt import (
     NodeGraph,

Diff for: examples/custom_nodes/custom_ports_node.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui
+from qtpy import QtCore, QtGui
 
 from NodeGraphQt import BaseNode
 

Diff for: requirements.txt

@@ -1 +1 @@
-Qt.py>=1.3.0
+qtpy>=1.11.2