Merge pull request #23 from rpartzsch/qt6-update

Qt6

Author: rpartzsch

.github/workflows/main.yml

@@ -38,23 +38,10 @@ jobs:
       - name: Package installation
         run: pip install -e .
 
-      - name: Qt5 defaults
-        shell: bash -l {0}
-        run: |
-          if [[ "$RUNNER_OS" == "Linux" ]];
-          then
-            echo "Qt5 default installation on $RUNNER_OS"
-            sudo apt-get install qttools5-dev-tools
-          fi
-
-          if [[ "$RUNNER_OS" == "Windows" ]];
-          then
-            echo "Qt5 default installation on $RUNNER_OS"
-            choco install qt5-default
-          fi
-
       - name: Headless display setup
-        uses: pyvista/setup-headless-display-action@v3
+        uses: pyvista/setup-headless-display-action@v4
+        with:
+          qt: true
 
       - name: Testing on branch -> ${{github.head_ref || github.ref_name}}
         run: pytest online_monitor
@@ -77,10 +64,11 @@ jobs:
         run: |
           pip install blosc
           pip install -e .
-          sudo apt-get install qttools5-dev-tools
           
       - name: Headless display setup
-        uses: pyvista/setup-headless-display-action@v3 
+        uses: pyvista/setup-headless-display-action@v4
+        with:
+          qt: true
 
       - name: Coverage report and upload  
         env:

README.md

@@ -73,9 +73,9 @@ This makes all converter / receiver / etc. instances within `path/to/plugin/fold
 # Custom receiver
 Have a look at [the examples](online_monitor/examples/receiver).
 When building your custom receiver, use `pyqtgraph` only for plotting-related tasks e.g. `pg.ImageItem` etc.
-Avoid using `pyqtgraph` for building generic widgets (especially the deprecated `QtGui` submodule), instead use `pyqt5` directly:
+Avoid using `pyqtgraph` for building generic widgets (especially the deprecated `QtGui` submodule), instead use `pyqt6` directly:
 ```
-from PyQt5 import QtWidgets, QtCore
+from PyQt6 import QtWidgets, QtCore
 
 my_custom_label = QtWidgets.QLabel("My label")
 my_custom_double_spinbox = QtWidgets.QDoubleSpinBox()

online_monitor/OnlineMonitor.py

@@ -1,7 +1,7 @@
 import sys
 import logging
 
-from PyQt5 import QtWidgets, QtCore
+from PyQt6 import QtWidgets, QtCore
 import pyqtgraph as pg
 from pyqtgraph.dockarea import DockArea, Dock
 

online_monitor/examples/receiver/bidirectional_receiver.py

@@ -5,7 +5,7 @@
 import pyqtgraph as pg
 from pyqtgraph.dockarea import DockArea, Dock
 
-from PyQt5 import QtWidgets
+from PyQt6 import QtWidgets
 
 from online_monitor.utils import utils
 

online_monitor/receiver/receiver.py

@@ -1,4 +1,4 @@
-from PyQt5 import QtCore
+from PyQt6 import QtCore
 import zmq
 import logging
 from threading import Event

online_monitor/start_online_monitor.py

@@ -4,7 +4,7 @@
 import psutil
 import subprocess
 import logging
-from PyQt5 import QtWidgets
+from PyQt6 import QtWidgets
 
 
 from online_monitor.utils import settings
@@ -46,7 +46,7 @@ def __init__(self):
 
 # Helper function to run code after OnlineMonitor Application exit
     def appExec():
-        app.exec_()
+        app.exec()
         # Stop other processes
         try:
             kill(producer_sim_process)

online_monitor/testing/test_online_monitor.py

@@ -8,7 +8,7 @@
 import time
 import os
 import psutil
-from PyQt5 import QtWidgets
+from PyQt6 import QtWidgets
 
 import online_monitor
 from online_monitor import OnlineMonitor

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "pyyaml",  # configuration parsing
     "psutil", # to get process stats
     "pyqtgraph>=0.13",  # plotting library
-    "pyqt5>=5.15.10",
+    "PyQt6",
     "pytest",
     "matplotlib",  # generate colormaps for lookuptables
     "testfixtures",  # for unittests with logging output inspection