From b5d5c7f4d35e624abb30a1d585d30596637bea94 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 24 Jun 2023 12:01:14 +0200
Subject: More qt 6 tooling

---
 .github/workflows/ci.yml    | 16 ++++++++--------
 qutebrowser/qt/machinery.py |  1 +
 scripts/link_pyqt.py        |  2 +-
 tox.ini                     |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64dddd2f8..a6b894186 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,8 @@ jobs:
       - name: Install dependencies
         run: |
             [[ ${{ matrix.testenv }} == eslint ]] && npm install -g eslint
-            [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get update && sudo apt-get install --no-install-recommends asciidoc
+            [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get update && sudo apt-get install --no-install-recommends asciidoc libegl1-mesa
+            [[ ${{ matrix.testenv }} == vulture || ${{ matrix.testenv }} == pylint ]] && sudo apt-get update && sudo apt-get install --no-install-recommends libegl1-mesa
             if [[ ${{ matrix.testenv }} == shellcheck ]]; then
                 scversion="stable"
                 bindir="$HOME/.local/bin"
@@ -89,17 +90,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - testenv: py
+          - testenv: py-qt5
             image: archlinux-webkit
-          - testenv: py
+          - testenv: py-qt5
             image: archlinux-webengine
-          - testenv: py-qt6
+          - testenv: py-qt5
+            image: archlinux-webengine-unstable
+          - testenv: py
             image: archlinux-webengine-qt6
           - testenv: py
-            image: archlinux-webengine-unstable
-            args: ""
-            # - testenv: py
-            #   image: archlinux-webengine-unstable-qt6  # FIXME:qt6.5 activate
+            image: archlinux-webengine-unstable-qt6
     container:
       image: "qutebrowser/ci:${{ matrix.image }}"
       env:
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py
index 1269da4c1..3fdb4efb4 100644
--- a/qutebrowser/qt/machinery.py
+++ b/qutebrowser/qt/machinery.py
@@ -178,6 +178,7 @@ def _select_wrapper(args: Optional[argparse.Namespace]) -> SelectionInfo:
         return SelectionInfo(wrapper=env_wrapper, reason=SelectionReason.env)
 
     if _WRAPPER_OVERRIDE is not None:
+        pass  # type: ignore[unreachable]
         assert _WRAPPER_OVERRIDE in WRAPPERS, _WRAPPER_OVERRIDE
         return SelectionInfo(wrapper=_WRAPPER_OVERRIDE, reason=SelectionReason.override)
 
diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index 4581bef41..63bdde959 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -125,7 +125,7 @@ def get_lib_path(executable, name, required=True):
         raise ValueError("Unexpected output: {!r}".format(output))
 
 
-def link_pyqt(executable, venv_path, *, version='5'):
+def link_pyqt(executable, venv_path, *, version):
     """Symlink the systemwide PyQt/sip into the venv.
 
     Args:
diff --git a/tox.ini b/tox.ini
index db639c129..aacfc965e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,10 +56,10 @@ commands =
     {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]
 basepython = {env:PYTHON:python3}
-- 
cgit v1.2.3-54-g00ecf