Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,17 @@ jobs:
tox: pyqt5
- name: PySide2
tox: pyside2
- name: PySide6
tox: pyside6
exclude:
- python:
tox: py39
os:
python_platform: win32
- python:
tox: py35
wrapper:
tox: pyside6
steps:
- uses: actions/checkout@v2
- name: Set up ${{ matrix.python.name }}
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ def read(fname):
# https://github.com/pytest-dev/pytest-twisted/pull/107#issuecomment-643679361
"pyside2 != 5.15.0",
],
"pyside6": [
"pyside6",
],
"test": [
"coverage",
"pytest",
Expand Down
12 changes: 9 additions & 3 deletions src/qt5reactor/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,15 @@
QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
)
except ImportError as e1:
raise ImportError(
"Neither PyQt5 nor PySide2 installed.\nPyQt5: {}\nPySide2: {})".format(e0, e1)
)
try:
# try PySide6
from PySide6.QtCore import (
QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
)
except ImportError as e2:
raise ImportError(
"Neither PyQt5, PySide2 nor PySide6 installed.\nPyQt5: {}\nPySide2: {}\nPySide6: {})".format(e0, e1, e2)
)

from twisted.internet.error import ReactorAlreadyInstalledError
from twisted.internet import posixbase
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion=3.1
envlist = py{35,36,37}-py{qt5,side2}
envlist = py{35,36,37,38,39}-py{qt5,side2},py{36,37,38,39}-pyside6

[testenv]
deps=
Expand All @@ -10,6 +10,7 @@ deps=
pyqt5: PyQt5-sip==12.8.0

pyside2: pyside2==5.15.1
pyside6: pyside6==6.1.3

passenv=
TOXENV
Expand Down