diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-11-24 09:26:30 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-11-24 09:26:30 +0100 |
| commit | a497ce69be7de4bcf44db1ef40ec19f27dcfecd6 (patch) | |
| tree | 75126f69d41b353b84b19a7c4f12dbe6dcd16a73 | |
| parent | ca667d642987a846e54b808362729a1f0b8aef07 (diff) | |
| download | qutebrowser-a497ce69be7de4bcf44db1ef40ec19f27dcfecd6.tar.gz qutebrowser-a497ce69be7de4bcf44db1ef40ec19f27dcfecd6.zip | |
tox/ci: Add PyQt 6.4
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-6.4.txt | 7 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-6.4.txt-raw | 4 | ||||
| -rw-r--r-- | tox.ini | 7 |
4 files changed, 19 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55bb16be5..a985e4e70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,6 +138,10 @@ jobs: - testenv: py39-pyqt63 os: ubuntu-20.04 python: 3.9 + ### PyQt 6.4 (Python 3.9) + - testenv: py39-pyqt64 + os: ubuntu-20.04 + python: 3.9 ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env) - testenv: py39-pyqt515 os: macos-11 diff --git a/misc/requirements/requirements-pyqt-6.4.txt b/misc/requirements/requirements-pyqt-6.4.txt new file mode 100644 index 000000000..91f45c849 --- /dev/null +++ b/misc/requirements/requirements-pyqt-6.4.txt @@ -0,0 +1,7 @@ +# This file is automatically generated by scripts/dev/recompile_requirements.py + +PyQt6==6.4.0 +PyQt6-Qt6==6.4.1 +PyQt6-sip==13.4.0 +PyQt6-WebEngine==6.4.0 +PyQt6-WebEngine-Qt6==6.4.1 diff --git a/misc/requirements/requirements-pyqt-6.4.txt-raw b/misc/requirements/requirements-pyqt-6.4.txt-raw new file mode 100644 index 000000000..2de7ab852 --- /dev/null +++ b/misc/requirements/requirements-pyqt-6.4.txt-raw @@ -0,0 +1,4 @@ +PyQt6 >= 6.4, < 6.5 +PyQt6-Qt6 >= 6.4, < 6.5 +PyQt6-WebEngine >= 6.4, < 6.5 +PyQt6-WebEngine-Qt6 >= 6.4, < 6.5 @@ -13,8 +13,8 @@ minversion = 3.20 setenv = PYTEST_QT_API=pyqt5 QUTE_QT_WRAPPER=PyQt5 - pyqt{62,63}: PYTEST_QT_API=pyqt6 - pyqt{62,63}: QUTE_QT_WRAPPER=PyQt6 + pyqt{62,63,64}: PYTEST_QT_API=pyqt6 + pyqt{62,63,64}: QUTE_QT_WRAPPER=PyQt6 cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report= passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND FORCE_COLOR DBUS_SESSION_BUS_ADDRESS basepython = @@ -33,8 +33,9 @@ deps = pyqt5152: -r{toxinidir}/misc/requirements/requirements-pyqt-5.15.2.txt 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 commands = - !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63: {envpython} scripts/link_pyqt.py --tox {envdir} + !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64: {envpython} scripts/link_pyqt.py --tox {envdir} {envpython} -bb -m pytest {posargs:tests} cov: {envpython} scripts/dev/check_coverage.py {posargs} |