diff options
| author | Florian Bruhin <me@the-compiler.org> | 2023-04-10 23:20:45 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2023-04-10 23:25:15 +0200 |
| commit | 30e70803d0329c1fa3018efe3577b9b99a2090b9 (patch) | |
| tree | aa9ae16fd9b537f34ce39e0fa518bbfce83b2039 | |
| parent | 39b6a1e946cfb542cca95938e372c9b991b6f016 (diff) | |
| download | qutebrowser-30e70803d0329c1fa3018efe3577b9b99a2090b9.tar.gz qutebrowser-30e70803d0329c1fa3018efe3577b9b99a2090b9.zip | |
ci: Add PyQt 6.5
See #7624
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-6.4.txt | 2 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-6.5.txt | 7 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-6.5.txt-raw | 4 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-6.txt | 10 | ||||
| -rw-r--r-- | tox.ini | 7 |
6 files changed, 23 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6c6fc051..4f3b63abc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,8 +153,8 @@ jobs: - testenv: py39-pyqt64 os: ubuntu-20.04 python: 3.9 - ### PyQt 6.4 (Python 3.11) - - testenv: py311-pyqt64 + ### PyQt 6.5 (Python 3.11) + - testenv: py311-pyqt65 os: ubuntu-22.04 python: 3.11 ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env) diff --git a/misc/requirements/requirements-pyqt-6.4.txt b/misc/requirements/requirements-pyqt-6.4.txt index 1ff4da141..59752f5a0 100644 --- a/misc/requirements/requirements-pyqt-6.4.txt +++ b/misc/requirements/requirements-pyqt-6.4.txt @@ -2,6 +2,6 @@ PyQt6==6.4.2 PyQt6-Qt6==6.4.3 -PyQt6-sip==13.4.1 +PyQt6-sip==13.5.0 PyQt6-WebEngine==6.4.0 PyQt6-WebEngine-Qt6==6.4.3 diff --git a/misc/requirements/requirements-pyqt-6.5.txt b/misc/requirements/requirements-pyqt-6.5.txt new file mode 100644 index 000000000..b95248bb9 --- /dev/null +++ b/misc/requirements/requirements-pyqt-6.5.txt @@ -0,0 +1,7 @@ +# This file is automatically generated by scripts/dev/recompile_requirements.py + +PyQt6==6.5.0 +PyQt6-Qt6==6.5.0 +PyQt6-sip==13.5.0 +PyQt6-WebEngine==6.5.0 +PyQt6-WebEngine-Qt6==6.5.0 diff --git a/misc/requirements/requirements-pyqt-6.5.txt-raw b/misc/requirements/requirements-pyqt-6.5.txt-raw new file mode 100644 index 000000000..f2c9ea25a --- /dev/null +++ b/misc/requirements/requirements-pyqt-6.5.txt-raw @@ -0,0 +1,4 @@ +PyQt6 >= 6.5, < 6.6 +PyQt6-Qt6 >= 6.5, < 6.6 +PyQt6-WebEngine >= 6.5, < 6.6 +PyQt6-WebEngine-Qt6 >= 6.5, < 6.6 diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt index 1ff4da141..b95248bb9 100644 --- a/misc/requirements/requirements-pyqt-6.txt +++ b/misc/requirements/requirements-pyqt-6.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.4.2 -PyQt6-Qt6==6.4.3 -PyQt6-sip==13.4.1 -PyQt6-WebEngine==6.4.0 -PyQt6-WebEngine-Qt6==6.4.3 +PyQt6==6.5.0 +PyQt6-Qt6==6.5.0 +PyQt6-sip==13.5.0 +PyQt6-WebEngine==6.5.0 +PyQt6-WebEngine-Qt6==6.5.0 @@ -13,8 +13,8 @@ minversion = 3.20 setenv = PYTEST_QT_API=pyqt5 QUTE_QT_WRAPPER=PyQt5 - pyqt{62,63,64}: PYTEST_QT_API=pyqt6 - pyqt{62,63,64}: QUTE_QT_WRAPPER=PyQt6 + pyqt{62,63,64,65}: PYTEST_QT_API=pyqt6 + pyqt{62,63,64,65}: QUTE_QT_WRAPPER=PyQt6 cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report= passenv = PYTHON @@ -48,8 +48,9 @@ deps = pyqt62: -r{toxinidir}/misc/requirements/requirements-pyqt-6.2.txt pyqt63: -r{toxinidir}/misc/requirements/requirements-pyqt-6.3.txt pyqt64: -r{toxinidir}/misc/requirements/requirements-pyqt-6.4.txt + pyqt65: -r{toxinidir}/misc/requirements/requirements-pyqt-6.5.txt commands = - !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64: {envpython} scripts/link_pyqt.py --tox {envdir} + !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65: {envpython} scripts/link_pyqt.py --tox {envdir} {envpython} -bb -m pytest {posargs:tests} cov: {envpython} scripts/dev/check_coverage.py {posargs} |