1 files changed, 50 insertions, 29 deletions
diff --git a/tox.ini b/tox.ini
index ffb15e2f9..238c532f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,12 +11,12 @@ minversion = 3.20
 
 [testenv]
 setenv =
-    PYTEST_QT_API=pyqt5
-    QUTE_QT_WRAPPER=PyQt5
-    pyqt{62,63,64,65}: PYTEST_QT_API=pyqt6
-    pyqt{62,63,64,65}: QUTE_QT_WRAPPER=PyQt6
+    PYTEST_QT_API=pyqt6
+    QUTE_QT_WRAPPER=PyQt6
+    pyqt{515,5152}: PYTEST_QT_API=pyqt5
+    pyqt{515,5152}: QUTE_QT_WRAPPER=PyQt5
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
-    py312: VIRTUALENV_PIP=23.1.2
+    py312: VIRTUALENV_PIP=23.2
     py312: PIP_REQUIRE_VIRTUALENV=0
 passenv =
     PYTHON
@@ -51,23 +51,28 @@ deps =
     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
+    pyqt66: -r{toxinidir}/misc/requirements/requirements-pyqt-6.6.txt
 commands =
-    !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65: {envpython} scripts/link_pyqt.py --tox {envdir}
+    !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66: {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}
     cov: {envpython} scripts/dev/check_coverage.py {posargs}
 
-[testenv:py-qt6]
+[testenv:py-qt5]
 setenv =
-    PYTEST_QT_API=pyqt6
-    QUTE_QT_WRAPPER=PyQt6
+    PYTEST_QT_API=pyqt5
+    QUTE_QT_WRAPPER=PyQt5
 
-[testenv:bleeding]
+[testenv:bleeding{,-qt5}]
 basepython = {env:PYTHON:python3}
+# Override default PyQt6 from [testenv]
 setenv =
-    PYTEST_QT_API=pyqt5
+    qt5: PYTEST_QT_API=pyqt5
+    qt5: QUTE_QT_WRAPPER=PyQt5
 pip_pre = true
 deps = -r{toxinidir}/misc/requirements/requirements-tests-bleeding.txt
-commands_pre = pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine
+commands_pre =
+    qt5: pip install --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine PyQt5-Qt5 PyQtWebEngine-Qt5 PyQt5-sip
+    !qt5: pip install --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt6 PyQt6-WebEngine PyQt6-Qt6 PyQt6-WebEngine-Qt6 PyQt6-sip
 commands = {envpython} -bb -m pytest {posargs:tests}
 
 # other envs
@@ -112,6 +117,7 @@ deps =
     -r{toxinidir}/misc/requirements/requirements-tests.txt
     -r{toxinidir}/misc/requirements/requirements-pylint.txt
     -r{toxinidir}/misc/requirements/requirements-pyqt.txt
+    -r{toxinidir}/misc/requirements/requirements-pyqt-5.txt
 commands =
     {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs}
     {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
@@ -180,19 +186,19 @@ commands =
     {envpython} scripts/dev/check_doc_changes.py {posargs}
     {envpython} scripts/asciidoc2html.py {posargs}
 
-[testenv:pyinstaller-{64bit,32bit}{,-qt6}]
+[testenv:pyinstaller{,-qt5}]
 basepython = {env:PYTHON:python3}
 passenv =
     APPDATA
     HOME
     PYINSTALLER_DEBUG
 setenv =
-    qt6: PYINSTALLER_QT6=true
+    qt5: PYINSTALLER_QT5=true
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt
-    !qt6: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
-    qt6: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
+    !qt5: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
+    qt5: -r{toxinidir}/misc/requirements/requirements-pyqt-5.txt
 commands =
     {envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec
 
@@ -223,8 +229,8 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-dev.txt
     -r{toxinidir}/misc/requirements/requirements-tests.txt
-    -r{toxinidir}/misc/requirements/requirements-mypy.txt
-    pyqt6: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
+    -r{toxinidir}/misc/requirements/requirements-mypy.txt  # includes PyQt5-stubs
+    -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
 commands =
     {envpython} -m mypy {env:QUTE_CONSTANTS_ARGS} qutebrowser {posargs}
 
@@ -245,12 +251,10 @@ commands =
 basepython = {env:PYTHON:python3}
 passenv = {[testenv:mypy-pyqt6]passenv}
 deps = {[testenv:mypy-pyqt6]deps}
-setenv =
-    pyqt6: QUTE_CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6
-    pyqt5: QUTE_CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6
+setenv = {[testenv:mypy-pyqt6]setenv}
 commands =
     {envpython} -m mypy --cobertura-xml-report {envtmpdir} {env:QUTE_CONSTANTS_ARGS} qutebrowser tests {posargs}
-    {envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:master}} {envtmpdir}/cobertura.xml
+    {envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:main}} {envtmpdir}/cobertura.xml
 
 [testenv:sphinx]
 basepython = {env:PYTHON:python3}
@@ -263,21 +267,38 @@ deps =
 commands =
     {envpython} -m sphinx -jauto -W --color {posargs} {toxinidir}/doc/extapi/ {toxinidir}/doc/extapi/_build/
 
-[testenv:build-release{,-qt6}]
+[testenv:update-version]
+basepython = {env:PYTHON:python3}
+passenv =
+    GITHUB_OUTPUT
+    CI
+deps = -r{toxinidir}/misc/requirements/requirements-dev.txt
+commands = {envpython} scripts/dev/update_version.py {posargs}
+
+[testenv:build-release{,-qt5}]
 basepython = {env:PYTHON:python3}
 passenv = *
-# Override default PyQt5 from [testenv]
+# Override default PyQt6 from [testenv]
 setenv =
-    qt6: QUTE_QT_WRAPPER=PyQt6
+    qt5: QUTE_QT_WRAPPER=PyQt5
 usedevelop = true
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-tox.txt
     -r{toxinidir}/misc/requirements/requirements-docs.txt
-    !qt6: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
-    qt6: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
+    !qt5: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
+    qt5: -r{toxinidir}/misc/requirements/requirements-pyqt-5.txt
     -r{toxinidir}/misc/requirements/requirements-dev.txt
     -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt
 commands =
-    !qt6: {envpython} {toxinidir}/scripts/dev/build_release.py {posargs}
-    qt6: {envpython} {toxinidir}/scripts/dev/build_release.py --qt6 {posargs}
+    !qt5: {envpython} {toxinidir}/scripts/dev/build_release.py {posargs}
+    qt5: {envpython} {toxinidir}/scripts/dev/build_release.py --qt5 {posargs}
+
+[testenv:package]
+basepython = {env:PYTHON:python3}
+setenv =
+    PYTHONWARNINGS=error,default:pkg_resources is deprecated as an API.:DeprecationWarning
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-dev.txt
+commands = {envpython} -m build