Add testing with pyqt5

.gitlab-ci.yml

@@ -7,7 +7,12 @@ before_script:
   - apt-get install --yes build-essential cmake libfmt-dev pybind11-dev graphviz python3-pyqt5 xvfb xdg-utils lcov
   - python -m pip install --upgrade pip
   - python --version
-  - pip install pytest pytest-cov sphinx furo numpydoc pytest-xvfb pytest-qt setuptools_scm sphinx-qt-documentation pytest-xdist pytest-mpl
+  - pip install -r requirements.txt
+  - pip install -r requirements_doc.txt
+  - pip install -r requirements_test.txt
+  - pip install $QT_API
+  - export PYTEST_QT_API=$QT_API
+  - export QT_API=$QT_API
   # - export CXXFLAGS='--coverage'
   - pip install -ve .
   # Move file, but should be handled by installation
@@ -17,7 +22,7 @@ before_script:
 .run-test:
   stage: test
   script:
-    - pytest --cov=b_asic --cov-report=xml:cov.xml --cov-report=term --color=yes test --mpl
+    - pytest --cov=b_asic --cov-report=xml:cov.xml --cov-report=term --color=yes test --mpl --timeout=20 --durations=10
     # - lcov --capture --directory . --output-file coverage.info
     # - lcov --output-file coverage.info --extract coverage.info $PWD/src/'*' $PWD/b_asic/'*'
     # - lcov --list coverage.info
@@ -30,19 +35,60 @@ before_script:
   coverage: /(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/
 
 
-run-test-3.8:
+run-test-3.8-pyside2:
+  variables:
+    QT_API: pyside2
   image: python:3.8
   extends: ".run-test"
 
-run-test-3.9:
+run-test-3.8-pyqt5:
+  variables:
+    QT_API: pyqt5
+  image: python:3.8
+  extends: ".run-test"
+
+run-test-3.9-pyside2:
+  variables:
+    QT_API: pyside2
+  image: python:3.9
+  extends: ".run-test"
+
+run-test-3.9-pyqt5:
+  variables:
+    QT_API: pyqt5
   image: python:3.9
   extends: ".run-test"
 
-run-test-3.10:
+run-test-3.10-pyside2:
+  variables:
+    QT_API: pyside2
   image: python:3.10
   extends: ".run-test"
 
+run-test-3.10-pyqt5:
+  variables:
+    QT_API: pyqt5
+  image: python:3.10
+  extends: ".run-test"
+
+# Seemingly works with Qt6, but tests stall on closing scheduler GUI due to modal dialog(?)
+#run-test-3.10-pyside6:
+#  variables:
+#    QT_API: pyside6
+#  image: python:3.10
+#  extends: ".run-test"
+#  allow_failure: true
+#
+#run-test-3.10-pyqt6:
+#  variables:
+#    QT_API: pyqt6
+#  image: python:3.10
+#  extends: ".run-test"
+#  allow_failure: true
+
 run-doc-test:
+  variables:
+    QT_API: pyside2
   image: python:3.10
   stage: test
   script:
@@ -53,6 +99,8 @@ run-doc-test:
 #  extends: ".run-test"
 
 pages:
+  variables:
+    QT_API: pyqt5
   stage: deploy
   image: python:3.10
   script:

b_asic/GUI/drag_button.py

@@ -83,8 +83,9 @@ class DragButton(QPushButton):
     def mousePressEvent(self, event):
         if event.button() == Qt.MouseButton.LeftButton:
             self._m_press = True
-            self._mouse_press_pos = event.pos()
-            self._mouse_move_pos = event.pos()
+            pos = event.pos()
+            self._mouse_press_pos = pos
+            self._mouse_move_pos = pos
 
         super().mousePressEvent(event)
 

b_asic/GUI/main_window.py

@@ -16,6 +16,7 @@ from qtpy.QtWidgets import (
     QAction,
     QApplication,
     QFileDialog,
+    QGraphicsItem,
     QGraphicsScene,
     QGraphicsTextItem,
     QGraphicsView,
@@ -527,7 +528,7 @@ class MainWindow(QMainWindow):
                 attr_button_scene.moveBy(
                     int(self.scene.width() / 4), int(self.scene.height() / 4)
                 )
-            attr_button_scene.setFlag(attr_button_scene.ItemIsSelectable, True)
+            attr_button_scene.setFlag(QGraphicsItem.ItemIsSelectable, True)
             operation_label = QGraphicsTextItem(op.name, attr_button_scene)
             if not self.is_show_names:
                 operation_label.setOpacity(0)

b_asic/scheduler_gui/axes_item.py

@@ -9,7 +9,7 @@ from math import pi, sin
 from typing import List, Optional, Union
 
 # QGraphics and QPainter imports
-from qtpy.QtCore import QPoint, QPointF, Qt
+from qtpy.QtCore import QPointF, Qt
 from qtpy.QtGui import QBrush, QPen, QPolygonF
 from qtpy.QtWidgets import (
     QGraphicsItem,
@@ -318,7 +318,7 @@ class AxesItem(QGraphicsItemGroup):
             self._append_x_tick()
         pos = self._x_ledger[-1].pos()
         self._x_ledger[-1].setPos(
-            pos + QPoint(self._width, 0)
+            pos + QPointF(self._width, 0)
         )  # move timeline
 
         # y-axis

b_asic/scheduler_gui/main_window.ui

@@ -57,7 +57,7 @@
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
        <property name="renderHints">
-        <set>QPainter::HighQualityAntialiasing|QPainter::TextAntialiasing</set>
+        <set>QPainter::Antialiasing|QPainter::TextAntialiasing</set>
        </property>
        <property name="viewportUpdateMode">
         <enum>QGraphicsView::FullViewportUpdate</enum>
@@ -126,7 +126,6 @@
         </property>
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -158,7 +157,6 @@
         </property>
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>

b_asic/scheduler_gui/ui_main_window.py

@@ -55,8 +55,7 @@ class Ui_MainWindow(object):
             QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop
         )
         self.view.setRenderHints(
-            QtGui.QPainter.HighQualityAntialiasing
-            | QtGui.QPainter.TextAntialiasing
+            QtGui.QPainter.Antialiasing | QtGui.QPainter.TextAntialiasing
         )
         self.view.setViewportUpdateMode(
             QtWidgets.QGraphicsView.FullViewportUpdate
@@ -89,7 +88,6 @@ class Ui_MainWindow(object):
         item = QtWidgets.QTableWidgetItem()
         font = QtGui.QFont()
         font.setBold(True)
-        font.setWeight(75)
         item.setFont(font)
         brush = QtGui.QBrush(QtGui.QColor(160, 160, 164))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -108,7 +106,6 @@ class Ui_MainWindow(object):
         item = QtWidgets.QTableWidgetItem()
         font = QtGui.QFont()
         font.setBold(True)
-        font.setWeight(75)
         item.setFont(font)
         brush = QtGui.QBrush(QtGui.QColor(160, 160, 164))
         brush.setStyle(QtCore.Qt.SolidPattern)

pyproject.toml

@@ -10,7 +10,7 @@ requires-python = ">=3.8"
 dependencies = [
     "numpy",
     "pybind11>=2.3.0",
-    "pyside2",
+    # "pyside2",
     "qtpy",
     "graphviz>=0.19",
     "matplotlib",
@@ -22,7 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
+#    "Programming Language :: Python :: 3.11",
     "Programming Language :: C++",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
@@ -56,7 +56,7 @@ skip-string-normalization = true
 preview = true
 line-length = 79
 exclude = [
-    "test/test_gui"
+    "test/test_gui", "b_asic/scheduler_gui/ui_main_window.py"
 ]
 
 [tool.isort]
@@ -64,7 +64,7 @@ profile = "black"
 line_length = 79
 src_paths = ["b_asic", "test"]
 skip = [
-    "test/test_gui"
+    "test/test_gui", "b_asic/scheduler_gui/ui_main_window.py"
 ]
 
 

requirements.txt

-setuptools_scm
+setuptools_scm[toml]>=6.2
+numpy
+pybind11>=2.3.0
+# pyside2
+qtpy
+graphviz>=0.19
+matplotlib

requirements_test.txt

@@ -2,5 +2,6 @@ pytest
 pytest-cov
 pytest-qt
 pytest-mpl
+pytest-timeout
 pytest-xvfb
 pytest-xdist