From 2fb1ad8d6761fd6443f8d5e6b358e37b1b58f975 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 20:59:35 -0400 Subject: [PATCH 01/10] qt 6 --- .github/workflows/ci.yml | 32 ++++++++++++++++++++++++-------- setup.py | 9 ++++----- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 455e4e0..f329df2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,24 +130,36 @@ jobs: - name: default tox: default dependencies: default + qt: false - name: PyQt5 tox: pyqt5 dependencies: qt5 + qt: true + qt-major: 5 + - name: PyQt6 + tox: pyqt6 + dependencies: qt6 + qt: true + qt-major: 6 - name: PySide2 tox: pyside2 dependencies: qt5 + qt: true + qt-major: 5 + - name: PySide6 + tox: pyside6 + dependencies: qt6 + qt: true + qt-major: 6 - name: asyncio tox: asyncio dependencies: asyncio + qt: false exclude: - python: major: 2 reactor: - tox: pyqt5 - - python: - major: 2 - reactor: - tox: pyside2 + qt: true - python: action: "3.11" reactor: @@ -159,11 +171,15 @@ jobs: - python: implementation: pypy reactor: - tox: pyqt5 + qt: true - python: - implementation: pypy + action: "3.5" reactor: - tox: pyside2 + qt-major: 6 + - python: + action: "3.6" + reactor: + qt-major: 6 steps: - uses: actions/checkout@v2 - name: Enable Problem Matchers diff --git a/setup.py b/setup.py index a4aef9c..97faa28 100755 --- a/setup.py +++ b/setup.py @@ -17,11 +17,10 @@ install_requires=["greenlet", "pytest>=2.3", "decorator"], extras_require={ "dev": ["pre-commit", "black"], - "pyside2": [ - # >= 0.6.3 for PySide2 extra version constraints - "qt5reactor[pyside2]>=0.6.3", - ], - "pyqt5": ["qt5reactor[pyqt5]>=0.6.2"], + "pyside2": ["qt5reactor[pyside2] @ git+https://github.com/twisted/qt5reactor@main"], + "pyside6": ["qt5reactor[pyside6] @ git+https://github.com/twisted/qt5reactor@main"], + "pyqt5": ["qt5reactor[pyqt5] @ git+https://github.com/twisted/qt5reactor@main"], + "pyqt6": ["qt5reactor[pyqt6] @ git+https://github.com/twisted/qt5reactor@main"], }, classifiers=[ "Development Status :: 5 - Production/Stable", From 0e6131c7b5383877965e201381e70c6ee48d3393 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:03:38 -0400 Subject: [PATCH 02/10] catchup tox.ini --- tox.ini | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index addfca7..97e44e0 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,9 @@ envlist= py{27,py27,35,36,37,38,39,310,311,py37,py38,py39}-defaultreactor py{35,36,37,38,39,310,311,py37,py38,py39}-asyncioreactor py{35,36,37,38,39,310,311}-pyqt5reactor + py{35,36,37,38,39,310,311}-pyqt6reactor py{35,36,37,38,39,310,311}-pyside2reactor + py{35,36,37,38,39,310,311}-pyside6reactor linting [testenv] @@ -12,16 +14,20 @@ deps= pytest twisted py37,py38,py39,pypy37,pypy38: hypothesis - pyqt5reactor,pyside2reactor: pytest-qt - pyqt5reactor,pyside2reactor: pytest-xvfb - pyqt5reactor,pyside2reactor: pywin32; sys_platform == 'win32' + pyqt5reactor,pyqt6reactor,pyside2reactor,pyside6reactor: pytest-qt + pyqt5reactor,pyqt6reactor,pyside2reactor,pyside6reactor: pytest-xvfb + pyqt5reactor,pyqt6reactor,pyside2reactor,pyside6reactor: pywin32; sys_platform == 'win32' extras= pyqt5reactor: pyqt5 + pyqt6reactor: pyqt6 pyside2reactor: pyside2 + pyside6reactor: pyside6 setenv= defaultreactor: REACTOR = default pyqt5reactor: REACTOR = qt5reactor + pyqt6reactor: REACTOR = qt5reactor pyside2reactor: REACTOR = qt5reactor + pyside6reactor: REACTOR = qt5reactor asyncioreactor: REACTOR = asyncio commands= pytest --reactor={env:REACTOR} From 3e648fd883ef1b04e9b472b00eaeacee62d57385 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:06:14 -0400 Subject: [PATCH 03/10] the branch is still named master --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 97faa28..7a7e7da 100755 --- a/setup.py +++ b/setup.py @@ -17,10 +17,10 @@ install_requires=["greenlet", "pytest>=2.3", "decorator"], extras_require={ "dev": ["pre-commit", "black"], - "pyside2": ["qt5reactor[pyside2] @ git+https://github.com/twisted/qt5reactor@main"], - "pyside6": ["qt5reactor[pyside6] @ git+https://github.com/twisted/qt5reactor@main"], - "pyqt5": ["qt5reactor[pyqt5] @ git+https://github.com/twisted/qt5reactor@main"], - "pyqt6": ["qt5reactor[pyqt6] @ git+https://github.com/twisted/qt5reactor@main"], + "pyside2": ["qt5reactor[pyside2] @ git+https://github.com/twisted/qt5reactor@master"], + "pyside6": ["qt5reactor[pyside6] @ git+https://github.com/twisted/qt5reactor@master"], + "pyqt5": ["qt5reactor[pyqt5] @ git+https://github.com/twisted/qt5reactor@master"], + "pyqt6": ["qt5reactor[pyqt6] @ git+https://github.com/twisted/qt5reactor@master"], }, classifiers=[ "Development Status :: 5 - Production/Stable", From a0679e1302dabed4403da81b6b9d33228ef1533a Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:10:51 -0400 Subject: [PATCH 04/10] libegl1 --- .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 f329df2..ecc7315 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5' run: | apt-get update --yes - apt-get install --yes libgl1 + apt-get install --yes libgl1 libegl1 - name: Install run: | pip install tox From 4e99c898eabec42e194208e0a05b863aec7284ba Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:13:11 -0400 Subject: [PATCH 05/10] Revert "libegl1" This reverts commit a0679e1302dabed4403da81b6b9d33228ef1533a. --- .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 ecc7315..f329df2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5' run: | apt-get update --yes - apt-get install --yes libgl1 libegl1 + apt-get install --yes libgl1 - name: Install run: | pip install tox From 8aab50df41a3378bdd495f185a43850200b51143 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:14:07 -0400 Subject: [PATCH 06/10] qt --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f329df2..7353c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,22 +133,22 @@ jobs: qt: false - name: PyQt5 tox: pyqt5 - dependencies: qt5 + dependencies: qt qt: true qt-major: 5 - name: PyQt6 tox: pyqt6 - dependencies: qt6 + dependencies: qt qt: true qt-major: 6 - name: PySide2 tox: pyside2 - dependencies: qt5 + dependencies: qt qt: true qt-major: 5 - name: PySide6 tox: pyside6 - dependencies: qt6 + dependencies: qt qt: true qt-major: 6 - name: asyncio @@ -216,7 +216,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' && matrix.reactor.dependencies == 'qt' run: | apt-get update --yes apt-get install --yes libgl1 From 93084f443ad21cb3a1208949dee33dc9310f0492 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:17:27 -0400 Subject: [PATCH 07/10] setup.py line lengths --- setup.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 7a7e7da..4b0d6c5 100755 --- a/setup.py +++ b/setup.py @@ -17,10 +17,18 @@ install_requires=["greenlet", "pytest>=2.3", "decorator"], extras_require={ "dev": ["pre-commit", "black"], - "pyside2": ["qt5reactor[pyside2] @ git+https://github.com/twisted/qt5reactor@master"], - "pyside6": ["qt5reactor[pyside6] @ git+https://github.com/twisted/qt5reactor@master"], - "pyqt5": ["qt5reactor[pyqt5] @ git+https://github.com/twisted/qt5reactor@master"], - "pyqt6": ["qt5reactor[pyqt6] @ git+https://github.com/twisted/qt5reactor@master"], + "pyside2": [ + "qt5reactor[pyside2] @ git+https://github.com/twisted/qt5reactor@master", + ], + "pyside6": [ + "qt5reactor[pyside6] @ git+https://github.com/twisted/qt5reactor@master", + ], + "pyqt5": [ + "qt5reactor[pyqt5] @ git+https://github.com/twisted/qt5reactor@master", + ], + "pyqt6": [ + "qt5reactor[pyqt6] @ git+https://github.com/twisted/qt5reactor@master", + ], }, classifiers=[ "Development Status :: 5 - Production/Stable", From 766fd195e5764db25da138d6335885edacd411eb Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:18:03 -0400 Subject: [PATCH 08/10] Revert "Revert "libegl1"" This reverts commit 4e99c898eabec42e194208e0a05b863aec7284ba. --- .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 7353c76..bbb6251 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt' run: | apt-get update --yes - apt-get install --yes libgl1 + apt-get install --yes libgl1 libegl1 - name: Install run: | pip install tox From 1606670b9618a7bf343f5f66341ed5a01fa85b89 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:21:26 -0400 Subject: [PATCH 09/10] libxkbcommon-x11-0 --- .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 bbb6251..dd193a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt' run: | apt-get update --yes - apt-get install --yes libgl1 libegl1 + apt-get install --yes libgl1 libegl1 libxkbcommon-x11-0 - name: Install run: | pip install tox From 8993385e4afbb714024cfa1c498211900a7f4788 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 10 Apr 2023 21:24:37 -0400 Subject: [PATCH 10/10] just go for it --- .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 dd193a2..30be63b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt' run: | apt-get update --yes - apt-get install --yes libgl1 libegl1 libxkbcommon-x11-0 + apt-get install --yes libgl1-mesa-dev libdbus-1-3 libxkbcommon-x11-0 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 - name: Install run: | pip install tox