Merge pull request #11 from nodedge/feature/upgrade-pyside6

Feature/upgrade pyside6

.isort.cfg

@@ -6,5 +6,5 @@ include_trailing_comma = True
 force_grid_wrap=0
 use_parentheses=True
 
-known_third_party = PIL,PyQt5,PySide2,black,coloredlogs,graphene,numpy,pandas,pylab,pyqtconsole,pyqtgraph,pytest,pytestqt,recommonmark,scipy,setuptools,yaml
+known_third_party = PIL,PyQt5,PySide2,PySide6,black,coloredlogs,graphene,numpy,pandas,pylab,pyqtconsole,pyqtgraph,pytest,pytestqt,recommonmark,scipy,setuptools,yaml
 

.pre-commit-config.yaml

@@ -2,23 +2,23 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/asottile/seed-isort-config
-    rev: v1.9.3
+    rev: v2.2.0
     hooks:
       - id: seed-isort-config
         stages: [commit]
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.10.1
     hooks:
       - id: isort
         stages: [commit]
-  - repo: https://github.com/ambv/black
-    rev: stable
+  - repo: https://github.com/psf/black
+    rev: 22.10.0
     hooks:
       - id: black
-        language_version: python3.6
+        language_version: python3.10
         stages: [commit]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
+    rev: v4.3.0
     hooks:
       - id: check-json
         stages: [commit]

.travis.yml

@@ -1,12 +1,21 @@
 os: linux
-dist: bionic
+dist: focal
 cache: pip
 
 addons:
   apt:
     packages:
     - x11-utils
     - libxkbcommon-x11-0
+    - libxcb-icccm4
+    - libxcb-image0
+    - libxcb-keysyms1
+    - libxcb-randr0
+    - libxcb-render-util0
+    - libxcb-xinerama0
+    - libxcb-xfixes0
+    - x11-utils
+
 
 services: xvfb
 
@@ -32,23 +41,23 @@ install:
 
 jobs:
   include:
-    - python: 3.6
+    - python: 3.10
       env: TOXENV=flake8
-    - python: 3.6
+    - python: 3.10
       env: TOXENV=black
-    - python: 3.6
+    - python: 3.10
       env: TOXENV=mypy
-    - python: 3.6
-      env: TOXENV=py36
+    - python: 3.10
+      env: TOXENV=py310
     - python: 3.7
       env: TOXENV=py37
     - python: 3.8
       env: TOXENV=py38
-    - python: 3.6
+    - python: 3.10
       env: TOXENV=coverage
-    - python: 3.6
+    - python: 3.10
       env: TOXENV=packaging
-    - python: 3.6
+    - python: 3.10
       env: TOXENV=docs
 
 

mypy.ini

@@ -9,6 +9,7 @@ show_error_context = True
 show_column_numbers = True
 show_error_codes = True
 pretty = True
+disable_error_code = attr-defined
 
 [mypy-pytest.*]
 ignore_missing_imports = True
@@ -30,5 +31,6 @@ ignore_missing_imports = True
 ;disallow_untyped_defs = True
 ;check_untyped_defs = True
 
-
+;[mypy-PySide6.*]
+;ignore_missing_attribute = True
 

nodedge/__main__.py

@@ -2,7 +2,7 @@
 import os
 import sys
 
-from PySide2.QtWidgets import QApplication
+from PySide6.QtWidgets import QApplication
 
 from nodedge.logger import highLightLoggingSetup, setupLogging
 from nodedge.mdi_window import MdiWindow
@@ -23,7 +23,7 @@ def main():
         f"{os.path.dirname(__file__)}/../examples/calculator/calculator.json"
     )
     try:
-        sys.exit(app.exec_())
+        sys.exit(app.exec())
     except Exception as e:
         dumpException(e)
 

nodedge/application_styler.py

@@ -6,9 +6,9 @@
 
 import logging
 
-import pyqtconsole.highlighter as hl
-from PySide2.QtGui import QColor, QGuiApplication, QPalette
-from PySide2.QtWidgets import QApplication
+# import pyqtconsole.highlighter as hl
+from PySide6.QtGui import QColor, QGuiApplication, QPalette
+from PySide6.QtWidgets import QApplication
 
 
 class ApplicationStyler:
@@ -50,16 +50,16 @@ def __init__(self):
         p.setColor(QPalette.WindowText, white)
         app.setPalette(p)
 
-        self.consoleStyle = {
-            "keyword": hl.format("blue", "bold"),
-            "operator": hl.format("white"),
-            "brace": hl.format("lightGray"),
-            "defclass": hl.format("white", "bold"),
-            "string": hl.format("magenta"),
-            "string2": hl.format("lightMagenta"),
-            "comment": hl.format("lightGreen", "italic"),
-            "self": hl.format("white", "italic"),
-            "numbers": hl.format("white"),
-            "inprompt": hl.format("lightBlue", "bold"),
-            "outprompt": hl.format("white", "bold"),
-        }
+        # self.consoleStyle = {
+        #     "keyword": hl.format("blue", "bold"),
+        #     "operator": hl.format("white"),
+        #     "brace": hl.format("lightGray"),
+        #     "defclass": hl.format("white", "bold"),
+        #     "string": hl.format("magenta"),
+        #     "string2": hl.format("lightMagenta"),
+        #     "comment": hl.format("lightGreen", "italic"),
+        #     "self": hl.format("white", "italic"),
+        #     "numbers": hl.format("white"),
+        #     "inprompt": hl.format("lightBlue", "bold"),
+        #     "outprompt": hl.format("white", "bold"),
+        # }

nodedge/blocks/graphics_block.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from PySide2.QtGui import QImage, QPixmap
+from PySide6.QtGui import QImage, QPixmap
 
 from nodedge.graphics_node import GraphicsNode
 

nodedge/blocks/graphics_block_content.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QHBoxLayout, QListWidget, QListWidgetItem, QSizePolicy
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QHBoxLayout, QListWidget, QListWidgetItem, QSizePolicy
 
 from nodedge.graphics_node_content import GraphicsNodeContent
 from nodedge.socket_type import SocketType
@@ -14,7 +14,7 @@ def initUI(self):
         # self.label.setObjectName(self.node.contentLabelObjectName)
 
         self.hLayout = QHBoxLayout(self)
-        self.hLayout.setMargin(0)
+        self.hLayout.setContentsMargins(0, 0, 0, 0)
         self.setLayout(self.hLayout)
         self.listInputs = QListWidget(self)
         self.listInputs.setSizePolicy(

nodedge/blocks/graphics_input_block_content.py

@@ -6,7 +6,7 @@
 
 from typing import Optional
 
-from PySide2.QtWidgets import QLineEdit
+from PySide6.QtWidgets import QLineEdit
 
 from nodedge.graphics_node_content import GraphicsNodeContent
 from nodedge.utils import dumpException

nodedge/blocks/graphics_output_block_content.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QLabel
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QLabel
 
 from nodedge.graphics_node_content import GraphicsNodeContent
 

nodedge/connector.py

@@ -10,7 +10,7 @@
 from enum import IntEnum
 from typing import List, Optional
 
-from PySide2.QtCore import QPointF
+from PySide6.QtCore import QPointF
 
 from nodedge.graphics_socket import GraphicsSocket
 from nodedge.serializable import Serializable

nodedge/edge_dragging.py

@@ -7,7 +7,7 @@
 from enum import IntEnum
 from typing import Optional
 
-from PySide2.QtWidgets import QGraphicsItem
+from PySide6.QtWidgets import QGraphicsItem
 
 from nodedge.connector import Socket
 from nodedge.edge import Edge, EdgeType

nodedge/editor_widget.py

@@ -7,9 +7,9 @@
 import os
 from typing import List, Optional
 
-from PySide2.QtCore import Qt
-from PySide2.QtGui import QBrush, QMouseEvent, QPen
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QBrush, QMouseEvent, QPen
+from PySide6.QtWidgets import (
     QApplication,
     QGraphicsItem,
     QLabel,

nodedge/editor_window.py

@@ -7,10 +7,15 @@
 import os
 from typing import Callable, Optional, Union, cast
 
-from PySide2.QtCore import QPoint, QSettings, QSize, Qt
-from PySide2.QtGui import QClipboard, QCloseEvent, QGuiApplication, QKeySequence
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QPoint, QSettings, QSize, Qt
+from PySide6.QtGui import (
     QAction,
+    QClipboard,
+    QCloseEvent,
+    QGuiApplication,
+    QKeySequence,
+)
+from PySide6.QtWidgets import (
     QFileDialog,
     QLabel,
     QMainWindow,
@@ -64,7 +69,7 @@ def __init__(self, parent: Optional[QWidget] = None):
 
         # Pycharm does not recognise resolve connect method so the inspection is
         # noinspection PyUnresolvedReferences
-        self.clipboard.dataChanged.connect(self.onClipboardChanged)
+        self.clipboard.dataChanged.connect(self.onClipboardChanged)  # type: ignore
 
         self.lastActiveEditorWidget: Optional[EditorWidget] = None
 
@@ -130,7 +135,7 @@ def createStatusBar(self) -> None:
         if self.currentEditorWidget is None:
             return
 
-        self.currentEditorWidget.graphicsView.scenePosChanged.connect(  # type: ignore
+        self.currentEditorWidget.graphicsView.scenePosChanged.connect(
             self.OnScenePosChanged
         )
 
@@ -576,7 +581,7 @@ def createAction(
         :return:
         """
         act = QAction(name, self)
-        act.triggered.connect(callback)
+        act.triggered.connect(callback)  # type: ignore
 
         if statusTip is not None:
             act.setStatusTip(statusTip)

nodedge/graphics_cut_line.py

@@ -5,9 +5,9 @@
 from enum import IntEnum
 from typing import List, Optional
 
-from PySide2.QtCore import QEvent, QPointF, QRectF, Qt
-from PySide2.QtGui import QMouseEvent, QPainter, QPainterPath, QPen, QPolygonF
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QEvent, QPointF, QRectF, Qt
+from PySide6.QtGui import QMouseEvent, QPainter, QPainterPath, QPen, QPolygonF
+from PySide6.QtWidgets import (
     QApplication,
     QGraphicsItem,
     QStyleOptionGraphicsItem,
@@ -53,7 +53,7 @@ def update(self, event: QMouseEvent) -> Optional[QMouseEvent]:
         eventButton: Qt.MouseButton = event.button()
         eventType: QEvent.Type = event.type()
         eventScenePos = self.graphicsView.mapToScene(event.pos())
-        eventModifiers: Qt.KeyboardModifiers = event.modifiers()
+        eventModifiers: Qt.KeyboardModifiers = event.modifiers()  # type: ignore
         if self.mode == CutLineMode.NOOP:
             if (
                 eventType == QEvent.MouseButtonPress

nodedge/graphics_edge.py

@@ -9,9 +9,9 @@
 import math
 from typing import Optional, Union
 
-from PySide2.QtCore import QPointF, Qt
-from PySide2.QtGui import QColor, QPainterPath, QPen
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QPointF, Qt
+from PySide6.QtGui import QColor, QPainterPath, QPen
+from PySide6.QtWidgets import (
     QApplication,
     QGraphicsItem,
     QGraphicsPathItem,

nodedge/graphics_node.py

@@ -6,9 +6,9 @@
 import logging
 from typing import Optional, cast
 
-from PySide2.QtCore import QRectF, Qt
-from PySide2.QtGui import QBrush, QColor, QFont, QPainterPath, QPen
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QRectF, Qt
+from PySide6.QtGui import QBrush, QColor, QFont, QPainterPath, QPen
+from PySide6.QtWidgets import (
     QApplication,
     QFrame,
     QGraphicsItem,
@@ -167,7 +167,7 @@ def initContent(self) -> None:
             titleFrame = GraphicsNodeTitleFrame(widget)
             titleFrame.setMaximumHeight(30)
             titleLayout = QHBoxLayout()
-            titleLayout.setMargin(0)
+            titleLayout.setContentsMargins(0, 0, 0, 0)
             titleFrame.setLayout(titleLayout)
             self.titleLabel = GraphicsNodeTitleLabel(self.title, widget)
             self.titleLabel.setSizePolicy(

nodedge/graphics_node_content.py

@@ -5,9 +5,9 @@
 from collections import OrderedDict
 from typing import Optional, cast
 
-from PySide2.QtCore import Qt
-from PySide2.QtGui import QFocusEvent
-from PySide2.QtWidgets import QGraphicsProxyWidget, QTextEdit, QVBoxLayout, QWidget
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QFocusEvent
+from PySide6.QtWidgets import QGraphicsProxyWidget, QTextEdit, QVBoxLayout, QWidget
 
 from nodedge.serializable import Serializable
 

nodedge/graphics_node_title_label.py

@@ -2,7 +2,7 @@
 """Graphics node title item module containing
 :class:`~nodedge.graphics_node_title_label.GraphicsNodeTitleLabel` class. """
 
-from PySide2.QtWidgets import QLabel, QWidget
+from PySide6.QtWidgets import QLabel, QWidget
 
 
 class GraphicsNodeTitleLabel(QLabel):