Update for Nuke 16

.github/workflows/github_tests_actions.yml

@@ -17,8 +17,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, windows-latest]
-        python-version: ["3.7", "3.9", "3.10"]
+        os: [macos-15, windows-latest]
+        python-version: ["3.13"]
       fail-fast: true
     steps:
       - name: Checkout repository
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.9", "3.10"]
+        python-version: ["3.13"]
       fail-fast: true
     steps:
       - name: Checkout repository

.gitignore

@@ -3,6 +3,7 @@ dist/
 bin/
 logs/
 archive/
+.idea/
 
 *tmp
 

nukeserversocket/console.py

@@ -4,8 +4,8 @@
 import logging
 from typing import Optional
 
-from PySide2.QtCore import Slot
-from PySide2.QtWidgets import (QWidget, QCheckBox, QGroupBox, QHBoxLayout,
+from PySide6.QtCore import Slot
+from PySide6.QtWidgets import (QWidget, QCheckBox, QGroupBox, QHBoxLayout,
                                QPushButton, QVBoxLayout, QPlainTextEdit)
 
 from .logger import get_logger

nukeserversocket/controllers/base.py

@@ -5,7 +5,7 @@
 from typing import List
 from datetime import datetime
 
-from PySide2.QtWidgets import QTextEdit, QPlainTextEdit
+from PySide6.QtWidgets import QTextEdit, QPlainTextEdit
 
 from ..logger import get_logger
 from ..settings import _NssSettings

nukeserversocket/controllers/houdini/scripts/python/app/main.py

@@ -3,7 +3,7 @@
 
 from typing import Optional
 
-from PySide2.QtWidgets import QWidget
+from PySide6.QtWidgets import QWidget
 
 from nukeserversocket.main import NukeServerSocket
 from nukeserversocket.utils import exec_code

nukeserversocket/controllers/local.py

@@ -8,7 +8,7 @@
 import sys
 import json
 
-from PySide2.QtWidgets import (QLabel, QWidget, QTextEdit, QHBoxLayout,
+from PySide6.QtWidgets import (QLabel, QWidget, QTextEdit, QHBoxLayout,
                                QPushButton, QSizePolicy, QVBoxLayout,
                                QApplication, QPlainTextEdit)
 

nukeserversocket/controllers/nuke.py

@@ -7,7 +7,7 @@
 from typing import Optional
 from textwrap import dedent
 
-from PySide2.QtWidgets import (QWidget, QSplitter, QTextEdit, QPushButton,
+from PySide6.QtWidgets import (QWidget, QSplitter, QTextEdit, QPushButton,
                                QApplication, QPlainTextEdit)
 
 from .base import EditorController

nukeserversocket/main.py

@@ -4,8 +4,8 @@
 import socket
 from typing import TYPE_CHECKING, Optional
 
-from PySide2.QtCore import Qt, Slot, QTimer
-from PySide2.QtWidgets import (QLabel, QWidget, QSpinBox, QFormLayout,
+from PySide6.QtCore import Qt, Slot, QTimer
+from PySide6.QtWidgets import (QLabel, QWidget, QSpinBox, QFormLayout,
                                QMainWindow, QPushButton, QVBoxLayout)
 
 from .logger import ConsoleHandler, get_logger

nukeserversocket/server.py

@@ -2,9 +2,9 @@
 
 from typing import TYPE_CHECKING, Union, Optional
 
-from PySide2.QtCore import Slot, Signal
-from PySide2.QtNetwork import QTcpServer, QTcpSocket, QHostAddress
-from PySide2.QtWidgets import QWidget
+from PySide6.QtCore import Slot, Signal
+from PySide6.QtNetwork import QTcpServer, QTcpSocket, QHostAddress
+from PySide6.QtWidgets import QWidget
 
 from .logger import get_logger
 from .received_data import ReceivedData
@@ -65,7 +65,7 @@ def _on_new_connection(self) -> None:
 
             LOGGER.debug('Pending connection.')
             self._socket = self.nextPendingConnection()
-            self._socket.error.connect(lambda err: LOGGER.error('Socket error: %s', err))
+            self._socket.errorOccurred.connect(lambda err: LOGGER.error('Socket error: %s', err))
 
             LOGGER.debug('Socket connected.')
             self._socket.readyRead.connect(self._on_socket_ready)

nukeserversocket/settings_ui.py

@@ -9,8 +9,8 @@
 from typing import TYPE_CHECKING, Any, Optional
 from textwrap import dedent
 
-from PySide2.QtCore import Slot
-from PySide2.QtWidgets import (QWidget, QSpinBox, QCheckBox, QLineEdit,
+from PySide6.QtCore import Slot
+from PySide6.QtWidgets import (QWidget, QSpinBox, QCheckBox, QLineEdit,
                                QFormLayout)
 
 if TYPE_CHECKING:

nukeserversocket/toolbar.py

@@ -6,10 +6,11 @@
 from typing import Dict, Optional
 from platform import python_version
 
-from PySide2 import __version__ as PySide2_version
-from PySide2.QtCore import Slot
-from PySide2.QtWidgets import (QLabel, QAction, QDialog, QWidget, QToolBar,
+from PySide6 import __version__ as PySide2_version
+from PySide6.QtCore import Slot
+from PySide6.QtWidgets import (QLabel, QDialog, QWidget, QToolBar,
                                QFormLayout, QPushButton)
+from PySide6.QtGui import (QAction)
 
 from .version import __version__
 

pyproject.toml

@@ -27,7 +27,7 @@ omit = ["nukeserversocket/tests/*", "nukeserversocket/__init__.py"]
 
 [tool.pytest.ini_options]
 testpaths = "tests"
-qt_api = "pyside2"
+qt_api = "pyside6"
 markers = ["quick: mark test"]
 addopts = [
     "--cov=nukeserversocket",
@@ -37,8 +37,8 @@ addopts = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.7.7,<3.11"
-pyside2 = "5.15.2.1"
+python = ">=3.9,<3.14"
+pyside6 = "6.9.2"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"

tests/test_editor_controller.py

@@ -6,7 +6,7 @@
 
 import pytest
 from pytestqt.qtbot import QtBot
-from PySide2.QtWidgets import QTextEdit, QPlainTextEdit
+from PySide6.QtWidgets import QTextEdit, QPlainTextEdit
 
 from nukeserversocket.settings import _NssSettings
 from nukeserversocket.received_data import ReceivedData

tests/test_main.py

@@ -3,9 +3,9 @@
 from typing import Optional
 
 import pytest
-from PySide2.QtCore import Signal, QObject
+from PySide6.QtCore import Signal, QObject
 from pytestqt.qtbot import QtBot
-from PySide2.QtWidgets import QWidget, QTextEdit, QPlainTextEdit
+from PySide6.QtWidgets import QWidget, QTextEdit, QPlainTextEdit
 
 from nukeserversocket.main import MainView, MainModel, MainController
 from nukeserversocket.server import NssServer

tests/test_nuke.py

@@ -5,7 +5,7 @@
 
 import pytest
 from pytestqt.qtbot import QtBot
-from PySide2.QtWidgets import QTextEdit, QPushButton, QPlainTextEdit
+from PySide6.QtWidgets import QTextEdit, QPushButton, QPlainTextEdit
 
 from nukeserversocket.settings import _NssSettings
 from nukeserversocket.received_data import ReceivedData

tests/test_server.py

@@ -6,7 +6,7 @@
 
 import pytest
 from pytestqt.qtbot import QtBot
-from PySide2.QtWidgets import QTextEdit, QPlainTextEdit
+from PySide6.QtWidgets import QTextEdit, QPlainTextEdit
 
 from nukeserversocket.utils import exec_code
 from nukeserversocket.server import NssServer