diff --git a/README.rst b/README.rst index f32758d3..955d94c2 100644 --- a/README.rst +++ b/README.rst @@ -36,8 +36,8 @@ The QTrio project's goal is to bring the friendly concurrency of Trio using Pyth ``async`` and ``await`` syntax together with the GUI features of Qt to enable more correct code and a more pleasant developer experience. QTrio is `permissively licensed `__ to avoid introducing -restrictions beyond those of the underlying Python Qt library you choose. Both PySide2 -and PyQt5 are supported. +restrictions beyond those of the underlying Python Qt library you choose. PyQt5, PyQt6, +PySide2, and PySide6 are supported. By enabling use of ``async`` and ``await`` it is possible in some cases to write related code more concisely and clearly than you would get with the signal and slot @@ -176,8 +176,8 @@ really containing the activity. :target: `repository`_ :alt: Repository -.. _tests: https://github.com/altendky/qtrio/actions?query=branch%3Amaster -.. |tests badge| image:: https://img.shields.io/github/workflow/status/altendky/qtrio/CI/main?color=seagreen&logo=GitHub-Actions&logoColor=whitesmoke +.. _tests: https://github.com/altendky/qtrio/actions?query=branch%3Amain +.. |tests badge| image:: https://img.shields.io/github/actions/workflow/status/altendky/qtrio/ci.yml?branch=main&color=seagreen&logo=GitHub-Actions&logoColor=whitesmoke :target: `tests`_ :alt: Tests diff --git a/docs/source/development/testing.rst b/docs/source/development/testing.rst index 9128c4fb..5b3fd2f3 100644 --- a/docs/source/development/testing.rst +++ b/docs/source/development/testing.rst @@ -17,7 +17,7 @@ You can run ``pytest``, ``black``, and ``sphinx`` directly from your own install python -m venv testvenv testvenv/bin/python -m pip install --upgrade pip setuptools wheel - testvenv/bin/python -m pip install --editable .[pyside2,p-checks,p-docs,p-tests] + testvenv/bin/python -m pip install --editable .[pyside6,p-checks,p-docs,p-tests] testvenv/bin/pytest --pyargs qtrio The CI test script, ``ci.sh``, in the project root will run ``pytest`` with ``coverage`` @@ -56,8 +56,8 @@ The documentation can be built with ``sphinx``. python -m venv testvenv testvenv/bin/python -m pip install --upgrade pip setuptools wheel - testvenv/bin/python -m pip install --editable .[pyside2,p-docs] - source testenv/bin/activate + testvenv/bin/python -m pip install --editable .[pyside6,p-docs] + source testvenv/bin/activate cd docs/ make html --always-make diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst index 88f4aa3c..a8f88071 100644 --- a/docs/source/getting_started.rst +++ b/docs/source/getting_started.rst @@ -27,13 +27,15 @@ are available for installing optional dependencies or applying version constrain - ``cli`` - For CLI usage, presently just examples. - ``examples`` - For running examples. - ``pyqt5`` - For running with PyQt5, primarily to apply any version constraints. +- ``pyqt6`` - For running with PyQt6, primarily to apply any version constraints. - ``pyside2`` - For running with PySide2, primarily to apply any version constraints. +- ``pyside6`` - For running with PySide6, primarily to apply any version constraints. A normal installation might look like: .. code-block:: bash - $ myenv/bin/pip install qtrio[pyside2] + $ myenv/bin/pip install qtrio[pyside6] Overview -------- diff --git a/docs/source/history.rst b/docs/source/history.rst index 3119c090..1c8c04f0 100644 --- a/docs/source/history.rst +++ b/docs/source/history.rst @@ -11,8 +11,7 @@ QTrio 0.8.0 (2026-07-22) Breaking changes ~~~~~~~~~~~~~~~~ -- QTrio now requires Python 3.10 or newer. Support for Python 3.7, 3.8, and 3.9 has been removed. (`#286 `__) - +- QTrio now requires Python 3.10 or newer. Support for Python 3.7, 3.8, and 3.9 has been removed. PySide2 remains supported, but is untested. (`#286 `__) Features ~~~~~~~~ diff --git a/qtrio/_core.py b/qtrio/_core.py index 863fa5d0..9affc9c8 100644 --- a/qtrio/_core.py +++ b/qtrio/_core.py @@ -163,8 +163,8 @@ class Emission: Note: Each time you access a signal such as ``a_qobject.some_signal`` you get a different signal instance object so the ``signal`` attribute generally will not - be the same object. A signal instance is a ``QtCore.SignalInstance`` in - PySide2 or ``QtCore.pyqtBoundSignal`` in PyQt5. + be the same object. A signal instance is a ``QtCore.SignalInstance`` in PySide or + ``QtCore.pyqtBoundSignal`` in PyQt. """ signal: "QtCore.SignalInstance" diff --git a/setup.cfg b/setup.cfg index 841abe17..4837ea77 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ project_urls = description = a library bringing Qt GUIs together with ``async`` and ``await`` via Trio long_description = file: README.rst long_description_content_type = text/x-rst -keywords = async, io, Trio, GUI, Qt, PyQt5, PySide2 +keywords = async, io, Trio, GUI, Qt, PyQt5, PyQt6, PySide2, PySide6 classifiers = License :: OSI Approved :: MIT License License :: OSI Approved :: Apache Software License