Merge pull request #7478 from qutebrowser/update-dependencies

Update dependencies

14 files changed, 24 insertions, 22 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3bebcfbc4..800d08111 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,13 +83,11 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - archlinux-webkit
           - archlinux-webengine
           # - archlinux-webengine-unstable
     container:
       image: "qutebrowser/ci:${{ matrix.image }}"
       env:
-        QUTE_BDD_WEBENGINE: "${{ matrix.image != 'archlinux-webkit' }}"
         DOCKER: "${{ matrix.image }}"
         CI: true
         PYTEST_ADDOPTS: "--color=yes"
diff --git a/.mypy.ini b/.mypy.ini
index 820b2f966..56124b5c3 100644
--- a/.mypy.ini
+++ b/.mypy.ini
@@ -10,7 +10,6 @@ disallow_subclassing_any = True
 disallow_incomplete_defs = True
 check_untyped_defs = True
 disallow_untyped_decorators = True
-# no_implicit_optional = True
 warn_redundant_casts = True
 warn_unused_ignores = True
 # warn_return_any = True
@@ -27,6 +26,9 @@ show_error_codes = True
 show_error_context = True
 pretty = True
 
+### FIXME:qt6 get rid of this for v3
+no_implicit_optional = False
+
 [mypy-colorama]
 # https://github.com/tartley/colorama/issues/206
 ignore_missing_imports = True
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index ed4a575d0..1cd283d8a 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -1,18 +1,18 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 chardet==5.0.0
-diff-cover==7.0.1
+diff-cover==7.0.2
 importlib-metadata==5.0.0
 importlib-resources==5.10.0
 Jinja2==3.1.2
 lxml==4.9.1
 MarkupSafe==2.1.1
-mypy==0.982
+mypy==0.990
 mypy-extensions==0.4.3
 pluggy==1.0.0
 Pygments==2.13.0
 PyQt5-stubs==5.15.6.0
 tomli==2.0.1
-types-PyYAML==6.0.12.1
+types-PyYAML==6.0.12.2
 typing_extensions==4.4.0
 zipp==3.10.0
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index 45789a1f8..5c938bea0 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -2,4 +2,4 @@
 
 altgraph==0.17.3
 pyinstaller==5.6.2
-pyinstaller-hooks-contrib==2022.12
+pyinstaller-hooks-contrib==2022.13
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 0f203f061..52211c92c 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -13,7 +13,7 @@ isort==5.10.1
 lazy-object-proxy==1.8.0
 mccabe==0.7.0
 pefile==2022.5.30
-platformdirs==2.5.3
+platformdirs==2.5.4
 pycparser==2.21
 PyJWT==2.6.0
 pylint==2.15.5
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index f1b33caa5..daa7f1dd8 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -7,7 +7,7 @@ charset-normalizer==2.1.1
 cheroot==8.6.0
 click==8.1.3
 coverage==6.5.0
-exceptiongroup==1.0.1
+exceptiongroup==1.0.2
 execnet==1.9.0
 filelock==3.8.0
 Flask==2.2.2
@@ -31,7 +31,7 @@ py-cpuinfo==9.0.0
 Pygments==2.13.0
 pyparsing==3.0.9
 pytest==7.2.0
-pytest-bdd==6.1.0
+pytest-bdd==6.1.1
 pytest-benchmark==4.0.0
 pytest-cov==4.0.0
 pytest-instafail==0.4.2
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index f94f80970..520b410b1 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -4,7 +4,7 @@ distlib==0.3.6
 filelock==3.8.0
 packaging==21.3
 pip==22.3.1
-platformdirs==2.5.3
+platformdirs==2.5.4
 pluggy==1.0.0
 py==1.11.0
 pyparsing==3.0.9
@@ -12,5 +12,5 @@ setuptools==65.5.1
 six==1.16.0
 tomli==2.0.1
 tox==3.27.0
-virtualenv==20.16.6
-wheel==0.38.2
+virtualenv==20.16.7
+wheel==0.38.4
diff --git a/misc/requirements/requirements-yamllint.txt b/misc/requirements/requirements-yamllint.txt
index efec35e56..2dccc1085 100644
--- a/misc/requirements/requirements-yamllint.txt
+++ b/misc/requirements/requirements-yamllint.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-pathspec==0.10.1
+pathspec==0.10.2
 PyYAML==6.0
 yamllint==1.28.0
diff --git a/qutebrowser/api/cmdutils.py b/qutebrowser/api/cmdutils.py
index 73c6a1bc5..3e1bc9432 100644
--- a/qutebrowser/api/cmdutils.py
+++ b/qutebrowser/api/cmdutils.py
@@ -233,7 +233,7 @@ class argument:  # noqa: N801,N806 pylint: disable=invalid-name
                                                              self._argname))
         if not hasattr(func, 'qute_args'):
             func.qute_args = {}  # type: ignore[attr-defined]
-        elif func.qute_args is None:  # type: ignore[attr-defined]
+        elif func.qute_args is None:
             raise ValueError("@cmdutils.argument got called above (after) "
                              "@cmdutils.register for {}!".format(funcname))
 
diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py
index 7d6a524c3..82fe3d70f 100644
--- a/qutebrowser/misc/checkpyver.py
+++ b/qutebrowser/misc/checkpyver.py
@@ -49,7 +49,9 @@ def check_python_version():
         version_str = '.'.join(map(str, sys.version_info[:3]))
         text = ("At least Python 3.7 is required to run qutebrowser, but " +
                 "it's running with " + version_str + ".\n")
-        if Tk and '--no-err-windows' not in sys.argv:  # pragma: no cover
+
+        show_errors = '--no-err-windows' not in sys.argv
+        if Tk and show_errors:  # type: ignore[truthy-function]  # pragma: no cover
             root = Tk()
             root.withdraw()
             messagebox.showerror("qutebrowser: Fatal error!", text)
diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py
index c3cdb1071..78d862ab4 100644
--- a/qutebrowser/utils/objreg.py
+++ b/qutebrowser/utils/objreg.py
@@ -170,7 +170,7 @@ def _get_tab_registry(win_id: _WindowTab,
         window: Optional[QWidget] = QApplication.activeWindow()
         if window is None or not hasattr(window, 'win_id'):
             raise RegistryUnavailableError('tab')
-        win_id = window.win_id  # type: ignore[attr-defined]
+        win_id = window.win_id
     elif win_id is None:
         raise TypeError("window is None with scope tab!")
 
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 704fcdb75..0c5074e3e 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -55,7 +55,7 @@ try:
                       CSafeDumper as YamlDumper)
     YAML_C_EXT = True
 except ImportError:  # pragma: no cover
-    from yaml import (SafeLoader as YamlLoader,  # type: ignore[misc]
+    from yaml import (SafeLoader as YamlLoader,  # type: ignore[assignment]
                       SafeDumper as YamlDumper)
     YAML_C_EXT = False
 
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2
index c30141216..d98443b07 100644
--- a/scripts/dev/ci/docker/Dockerfile.j2
+++ b/scripts/dev/ci/docker/Dockerfile.j2
@@ -9,7 +9,8 @@ RUN pacman -Suyy --noconfirm \
     python-distlib \
     qt5-base \
     qt5-declarative \
-    {% if webengine %}qt5-webengine python-pyqtwebengine{% else %}qt5-webkit{% endif %} \
+    qt5-webengine \
+    python-pyqtwebengine \
     python-pyqt5 \
     xorg-xinit \
     xorg-server-xvfb \
diff --git a/scripts/dev/ci/docker/generate.py b/scripts/dev/ci/docker/generate.py
index 2ab25f325..0d197a7e0 100644
--- a/scripts/dev/ci/docker/generate.py
+++ b/scripts/dev/ci/docker/generate.py
@@ -31,9 +31,8 @@ def main():
 
     image = sys.argv[1]
     config = {
-        'archlinux-webkit': {'webengine': False, 'unstable': False},
-        'archlinux-webengine': {'webengine': True, 'unstable': False},
-        'archlinux-webengine-unstable': {'webengine': True, 'unstable': True},
+        'archlinux-webengine': {'unstable': False},
+        'archlinux-webengine-unstable': {'unstable': True},
     }[image]
 
     with open('Dockerfile', 'w') as f: