From 7497a9bafe983c1f0fb5ab5a0c032770ab00aa52 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Mar 2022 09:02:45 -0400 Subject: [PATCH 1/5] first pass --- .github/workflows/ci.yml | 13 ++++++++++++- setup.py | 5 +++++ tox.ini | 10 ++++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a456962..55b4a56 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 @@ -169,7 +180,7 @@ jobs: echo pip freeze --all - name: Install Linux Qt5 dependencies - if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5' + if: matrix.os.python_platform == 'linux' && contains(['qt5', 'qt6'], matrix.reactor.dependencies) run: | apt-get update --yes apt-get install --yes libgl1 diff --git a/setup.py b/setup.py index b380e7f..6a0b419 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] @ https://github.com/sveinse/qt5reactor@feature_pyside6", + ], "pyqt5": ["qt5reactor[pyqt5]>=0.6.2"], }, classifiers=[ diff --git a/tox.ini b/tox.ini index eb643d4..139c2aa 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist= py{27,py27,35,36,37,38,39,py36,py37}-defaultreactor py{35,36,37,38,39,py36,py37}-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} From 9534aebc695e1044bad6e467ee38bb925de1e064 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Mar 2022 10:16:35 -0400 Subject: [PATCH 2/5] fix qt5reactor pyside6 support PR url --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6a0b419..8d16bf3 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ "pyside6": [ # TODO: specify version # >= 0.6.x for PySide6 support - "qt5reactor[pyside6] @ https://github.com/sveinse/qt5reactor@feature_pyside6", + "qt5reactor[pyside6] @ git+https://github.com/sveinse/qt5reactor@feature-pyside6", ], "pyqt5": ["qt5reactor[pyqt5]>=0.6.2"], }, From 2b464ac5c0394bc3168020bc2c0b6b4a6fe0667f Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Mar 2022 10:25:38 -0400 Subject: [PATCH 3/5] fixup yaml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a58fb1..d76da9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: echo pip freeze --all - name: Install Linux Qt5 dependencies - if: matrix.os.python_platform == 'linux' && contains(['qt5', 'qt6'], matrix.reactor.dependencies) + if: matrix.os.python_platform == 'linux' && (matrix.reactor.dependencies == 'qt5' or matrix.reactor.dependencies == 'qt6') run: | apt-get update --yes apt-get install --yes libgl1 From 6cd9ff2053938f447a37954e4263a15d08931392 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Mar 2022 10:25:58 -0400 Subject: [PATCH 4/5] fixup yaml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d76da9c..74eb2ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: echo pip freeze --all - name: Install Linux Qt5 dependencies - if: matrix.os.python_platform == 'linux' && (matrix.reactor.dependencies == 'qt5' or matrix.reactor.dependencies == 'qt6') + if: matrix.os.python_platform == 'linux' && (matrix.reactor.dependencies == 'qt5' || matrix.reactor.dependencies == 'qt6') run: | apt-get update --yes apt-get install --yes libgl1 From e47341fa4e998c8921e8ffbe700ac44e218f4cd2 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Mar 2022 15:02:50 -0400 Subject: [PATCH 5/5] libegl1 for qt6 --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74eb2ad..cf05031 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,10 +180,15 @@ jobs: echo pip freeze --all - name: Install Linux Qt5 dependencies - if: matrix.os.python_platform == 'linux' && (matrix.reactor.dependencies == 'qt5' || matrix.reactor.dependencies == 'qt6') + if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5' 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