diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3efd927..cf05031 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,6 +109,9 @@ jobs: - name: PySide2 tox: pyside2 dependencies: qt5 + - name: PySide6 + tox: pyside6 + dependencies: qt6 - name: asyncio tox: asyncio dependencies: asyncio @@ -121,6 +124,10 @@ jobs: major: 2 reactor: tox: pyside2 + - python: + major: 2 + reactor: + tox: pyside6 - python: major: 2 reactor: @@ -133,6 +140,10 @@ jobs: implementation: pypy reactor: tox: pyside2 + - python: + implementation: pypy + reactor: + tox: pyside6 steps: - uses: actions/checkout@v2 - name: Enable Problem Matchers @@ -173,6 +184,11 @@ jobs: run: | apt-get update --yes apt-get install --yes libgl1 + - name: Install Linux Qt6 dependencies + if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt6' + run: | + apt-get update --yes + apt-get install --yes libgl1 libegl1 - name: Install run: | pip install tox diff --git a/setup.py b/setup.py index b380e7f..8d16bf3 100755 --- a/setup.py +++ b/setup.py @@ -21,6 +21,11 @@ # >= 0.6.3 for PySide2 extra version constraints "qt5reactor[pyside2]>=0.6.3", ], + "pyside6": [ + # TODO: specify version + # >= 0.6.x for PySide6 support + "qt5reactor[pyside6] @ git+https://github.com/sveinse/qt5reactor@feature-pyside6", + ], "pyqt5": ["qt5reactor[pyqt5]>=0.6.2"], }, classifiers=[ diff --git a/tox.ini b/tox.ini index cad52b0..a8d49a7 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist= py{27,py27,35,36,37,38,39,py37,py38}-defaultreactor py{35,36,37,38,39,py37,py38}-asyncioreactor py{35,36,37,38,39}-pyqt5reactor - py{35,36,37,38,39}-pyside2reactor + py{35,36,37,38,39}-pyside{2,6}}reactor linting [testenv] @@ -11,16 +11,18 @@ deps= greenlet pytest twisted - pyqt5reactor,pyside2reactor: pytest-qt - pyqt5reactor,pyside2reactor: pytest-xvfb - pyqt5reactor,pyside2reactor: pywin32; sys_platform == 'win32' + pyqt5reactor,pyside{2,6}reactor: pytest-qt + pyqt5reactor,pyside{2,6}reactor: pytest-xvfb + pyqt5reactor,pyside{2,6}reactor: pywin32; sys_platform == 'win32' extras= pyqt5reactor: pyqt5 pyside2reactor: pyside2 + pyside6reactor: pyside6 setenv= defaultreactor: REACTOR = default pyqt5reactor: REACTOR = qt5reactor pyside2reactor: REACTOR = qt5reactor + pyside6reactor: REACTOR = qt5reactor asyncioreactor: REACTOR = asyncio commands= pytest --reactor={env:REACTOR}