Add qt6 support

Author: niketh-keshavan

.github/workflows/ci.yml

@@ -111,12 +111,16 @@ jobs:
       matrix:
         python: ['3.10', '3.11']
         arch: ['x86', 'x64']
-        qt_library: ['PyQt5', 'PySide2']
+        qt_library: ['PyQt5', 'PySide2', 'PyQt6', 'PySide6']
         exclude:
           - python: '3.10'
             qt_library: 'PySide2'
           - python: '3.11'
             qt_library: 'PySide2'
+          - arch: 'x86'
+            qt_library: 'PyQt6'
+          - arch: 'x86'
+            qt_library: 'PySide6'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -148,7 +152,7 @@ jobs:
       fail-fast: false
       matrix:
         python: ['3.10', '3.11']
-        qt_library: ['PyQt5', 'PySide2']
+        qt_library: ['PyQt5', 'PySide2', 'PyQt6', 'PySide6']
         exclude:
           - python: '3.10'
             qt_library: 'PySide2'
@@ -164,7 +168,7 @@ jobs:
       - name: Install Linux test dependencies
         run: |
           apt-get update --yes
-          apt-get install --yes libgl1-mesa-dev xvfb x11-utils libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
+          apt-get install --yes libgl1-mesa-dev xvfb x11-utils libdbus-1-3 libxkbcommon-x11-0 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
       - name: Run tests
         run: ./ci.sh
         env:
@@ -184,7 +188,7 @@ jobs:
       fail-fast: false
       matrix:
         python: ['3.10', '3.11']
-        qt_library: ['PyQt5', 'PySide2']
+        qt_library: ['PyQt5', 'PySide2', 'PyQt6', 'PySide6']
         exclude:
           - python: '3.10'
             qt_library: 'PySide2'
@@ -201,6 +205,7 @@ jobs:
         run: ./ci.sh
         env:
           INSTALL_EXTRAS: '[${{ matrix.qt_library }},p-tests]'
+          QT_QPA_PLATFORM: 'offscreen'
       - uses: codecov/codecov-action@v7
         if: always()
         with:

qtrio/_core.py

@@ -16,6 +16,7 @@
 import attr
 import outcome
 import qts
+import qts.util
 import trio
 import trio.abc
 
@@ -65,16 +66,12 @@ def register_event_type() -> None:
 
     # assign to the global
     # TODO: https://bugreports.qt.io/browse/PYSIDE-1347
-    if qts.is_pyqt_5_wrapper:
-        _reenter_event_type = QtCore.QEvent.Type(event_hint)
-    elif qts.is_pyside_5_wrapper:
+    if qts.is_pyside_5_wrapper:
         _reenter_event_type = typing.cast(
             typing.Callable[[int], QtCore.QEvent.Type], QtCore.QEvent.Type
         )(event_hint)
-    else:  # pragma: no cover
-        raise qtrio.InternalError(
-            "You should not be here but you are running neither PyQt5 nor PySide2.",
-        )
+    else:
+        _reenter_event_type = QtCore.QEvent.Type(event_hint)
 
 
 def register_requested_event_type(requested_value: int | QtCore.QEvent.Type) -> None:
@@ -99,17 +96,13 @@ def register_requested_event_type(requested_value: int | QtCore.QEvent.Type) ->
         raise qtrio.EventTypeAlreadyRegisteredError()
 
     # TODO: https://bugreports.qt.io/browse/PYSIDE-1468
-    if qts.is_pyqt_5_wrapper:
-        event_hint = QtCore.QEvent.registerEventType(requested_value)
-    elif qts.is_pyside_5_wrapper:
+    if qts.is_pyside_5_wrapper:
         event_hint = typing.cast(
             typing.Callable[[int | QtCore.QEvent.Type], int],
             QtCore.QEvent.registerEventType,
         )(requested_value)
-    else:  # pragma: no cover
-        raise qtrio.InternalError(
-            "You should not be here but you are running neither PyQt5 nor PySide2.",
-        )
+    else:
+        event_hint = QtCore.QEvent.registerEventType(requested_value)
 
     if event_hint == -1:
         raise qtrio.EventTypeRegistrationFailedError()
@@ -120,16 +113,12 @@ def register_requested_event_type(requested_value: int | QtCore.QEvent.Type) ->
 
     # assign to the global
     # TODO: https://bugreports.qt.io/browse/PYSIDE-1347
-    if qts.is_pyqt_5_wrapper:
-        _reenter_event_type = QtCore.QEvent.Type(event_hint)
-    elif qts.is_pyside_5_wrapper:
+    if qts.is_pyside_5_wrapper:
         _reenter_event_type = typing.cast(
             typing.Callable[[int], QtCore.QEvent.Type], QtCore.QEvent.Type
         )(event_hint)
-    else:  # pragma: no cover
-        raise qtrio.InternalError(
-            "You should not be here but you are running neither PyQt5 nor PySide2.",
-        )
+    else:
+        _reenter_event_type = QtCore.QEvent.Type(event_hint)
 
 
 async def wait_signal(signal: "QtCore.SignalInstance") -> typing.Tuple[object, ...]:
@@ -541,17 +530,13 @@ def maybe_build_application() -> "QtGui.QGuiApplication":
     application: QtCore.QCoreApplication
 
     # TODO: https://bugreports.qt.io/browse/PYSIDE-1467
-    if qts.is_pyqt_5_wrapper:
-        maybe_application = QtWidgets.QApplication.instance()
-    elif qts.is_pyside_5_wrapper:
+    if qts.is_pyside_5_wrapper:
         maybe_application = typing.cast(
             typing.Optional["QtCore.QCoreApplication"],
             QtWidgets.QApplication.instance(),
         )
-    else:  # pragma: no cover
-        raise qtrio.InternalError(
-            "You should not be here but you are running neither PyQt5 nor PySide2.",
-        )
+    else:
+        maybe_application = QtWidgets.QApplication.instance()
 
     if maybe_application is None:
         application = QtWidgets.QApplication(sys.argv[1:])
@@ -660,7 +645,7 @@ def run(
             self.application.aboutToQuit.connect(_early_quit_warning)
 
         if execute_application:
-            return_code = self.application.exec_()
+            return_code = qts.util.exec(self.application)
 
             self.outcomes = attr.evolve(
                 self.outcomes,

qtrio/_qt.py

@@ -129,8 +129,10 @@ def connection(
     finally:
         expected_exception: typing.Type[Exception]
 
-        if qts.is_pyside_5_wrapper or qts.is_pyside_6_wrapper:
+        if qts.is_pyside_5_wrapper:
             expected_exception = RuntimeError
+        elif qts.is_pyside_6_wrapper:
+            expected_exception = SystemError
         else:
             expected_exception = TypeError
 

qtrio/_tests/helpers.py

@@ -6,10 +6,10 @@
 @pytest.fixture(name="qtrio_preshow_workaround", scope="session", autouse=True)
 def qtrio_preshow_workaround_fixture(qapp):
     dialog = QtWidgets.QMessageBox(
-        QtWidgets.QMessageBox.Information,
+        QtWidgets.QMessageBox.Icon.Information,
         "",
         "",
-        QtWidgets.QMessageBox.Ok,
+        QtWidgets.QMessageBox.StandardButton.Ok,
     )
 
     dialog.show()

qtrio/_tests/test_core.py

@@ -6,7 +6,9 @@
 
 import outcome
 import pytest
+import qts
 from qts import QtCore
+from qts import QtWidgets
 import qtrio
 import qtrio._core
 import trio
@@ -82,6 +84,7 @@ def test():
         sys.platform == "win32"
         and sys.version_info >= (3, 11)
         and os.environ.get("CI") == "true"
+        and not qts.is_pyside_6_wrapper
     ),
     reason="the stderr fails to be captured in PyCharm and GitHub Actions",
 )
@@ -106,10 +109,18 @@ def test_reenter_event_writes_to_stderr_for_exception(capsys, testdir):
     # TODO: diagnostics to be removed
     print(repr(result.stderr.str()))
     print(result.stderr.str())
+    if qts.is_pyside_6_wrapper:
+        internal_error_line = (
+            r"^qtrio\._exceptions\.InternalError: Error calling Python override of"
+            r" QObject::event\(\): Exception while handling a reenter event$"
+        )
+    else:
+        internal_error_line = r"^qtrio\._exceptions\.InternalError: Exception while handling a reenter event$"
+
     result.stderr.re_match_lines(
         lines2=[
             r"^TypeError: 'int' object is not callable$",
-            r"^qtrio\._exceptions\.InternalError: Exception while handling a reenter event$",
+            internal_error_line,
         ],
     )
 
@@ -408,7 +419,7 @@ def test():
             pass
 
         with pytest.raises(qtrio.EventTypeRegistrationFailedError):
-            qtrio.register_requested_event_type(QtCore.QEvent.User)
+            qtrio.register_requested_event_type(QtCore.QEvent.Type.User)
     """
     testdir.makepyfile(test_file)
 
@@ -446,9 +457,9 @@ def test_requesting_available_event_type_succeeds(testdir):
 
 
     def test():
-        qtrio.register_requested_event_type(QtCore.QEvent.User)
+        qtrio.register_requested_event_type(QtCore.QEvent.Type.User)
 
-        assert qtrio.registered_event_type() == QtCore.QEvent.User
+        assert qtrio.registered_event_type() == QtCore.QEvent.Type.User
     """
     testdir.makepyfile(test_file)
 
@@ -686,6 +697,20 @@ async def test():
     )
 
 
+def test_qobject_destroyed_signal_equality(qapp):
+    """Verify that an object's signal instances compare equal."""
+    q_object = QtCore.QObject()
+
+    assert q_object.destroyed == q_object.destroyed
+
+
+def test_qpushbutton_clicked_signal_equality(qapp):
+    """Verify that inherited signal instances compare equal."""
+    button = QtWidgets.QPushButton()
+
+    assert button.clicked == button.clicked
+
+
 def test_emissions_equal():
     """:class:`Emission` objects created from the same :class:`QtCore.Signal` instance
     and args are equal even if the attributes are different instances.
@@ -701,6 +726,15 @@ class C(QtCore.QObject):
     ) == qtrio._core.Emission(signal=instance.signal, args=(13,))
 
 
+def test_emissions_for_buttons():
+    """:class:`Emission` objects for the same button signal are equal."""
+    instance = QtWidgets.QPushButton()
+
+    assert qtrio._core.Emission(
+        signal=instance.clicked, args=(13,)
+    ) == qtrio._core.Emission(signal=instance.clicked, args=(13,))
+
+
 def test_emissions_unequal_by_signal():
     """:class:`Emission` objects with the same arguments but different signals are
     unequal.
@@ -1169,6 +1203,8 @@ def test_execute_manually(testdir):
     """Executing manually works."""
 
     test_file = r"""
+    import qts.util
+
     import qtrio
 
 
@@ -1184,7 +1220,7 @@ async def async_fn():
 
         assert not ran
 
-        runner.application.exec_()
+        qts.util.exec(runner.application)
 
         assert ran
     """

qtrio/_tests/test_dialogs.py

@@ -51,7 +51,7 @@ async def user(task_status):
             task_status.started()
 
         qtbot.keyClicks(dialog.edit_widget, str(test_value))
-        qtbot.mouseClick(dialog.accept_button, QtCore.Qt.LeftButton)
+        qtbot.mouseClick(dialog.accept_button, QtCore.Qt.MouseButton.LeftButton)
 
     test_value = 928
 
@@ -73,7 +73,7 @@ async def user(task_status):
             task_status.started()
 
         qtbot.keyClicks(dialog.edit_widget, "abc")
-        qtbot.mouseClick(dialog.reject_button, QtCore.Qt.LeftButton)
+        qtbot.mouseClick(dialog.reject_button, QtCore.Qt.MouseButton.LeftButton)
 
     async with trio.open_nursery() as nursery:
         await nursery.start(user)
@@ -92,7 +92,7 @@ async def user(task_status):
             task_status.started()
 
         qtbot.keyClicks(dialog.edit_widget, "abc")
-        qtbot.mouseClick(dialog.accept_button, QtCore.Qt.LeftButton)
+        qtbot.mouseClick(dialog.accept_button, QtCore.Qt.MouseButton.LeftButton)
 
     async with trio.open_nursery() as nursery:
         await nursery.start(user)
@@ -229,7 +229,7 @@ async def test_information_message_box(qtbot: pytestqt.qtbot.QtBot) -> None:
     dialog = qtrio.dialogs.create_message_box(
         title="Information",
         text=text,
-        icon=QtWidgets.QMessageBox.Information,
+        icon=QtWidgets.QMessageBox.Icon.Information,
     )
 
     async def user(task_status):
@@ -255,8 +255,11 @@ async def test_information_message_box_cancel(qtbot: pytestqt.qtbot.QtBot) -> No
     dialog = qtrio.dialogs.create_message_box(
         title="",
         text="",
-        icon=QtWidgets.QMessageBox.Information,
-        buttons=QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel,
+        icon=QtWidgets.QMessageBox.Icon.Information,
+        buttons=(
+            QtWidgets.QMessageBox.StandardButton.Ok
+            | QtWidgets.QMessageBox.StandardButton.Cancel
+        ),
     )
 
     async def user(task_status):