Merge pull request #6917 from qutebrowser/update-dependencies

Update dependencies

11 files changed, 34 insertions, 13 deletions

diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 6de742e61..932ab161e 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -23,7 +23,7 @@ pep517==0.12.0
 pkginfo==1.8.2
 pycparser==2.21
 Pygments==2.10.0
-Pympler==1.0
+Pympler==1.0.1
 pyparsing==3.0.6
 PyQt-builder==1.12.2
 python-dateutil==2.8.2
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index 8dfc046fd..dc20c9d69 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -7,7 +7,7 @@ importlib-resources==5.4.0
 Jinja2==3.0.3
 lxml==4.7.1
 MarkupSafe==2.0.1
-mypy==0.920
+mypy==0.930
 mypy-extensions==0.4.3
 pluggy==1.0.0
 Pygments==2.10.0
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index b41f16a90..2e1b57e31 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -14,7 +14,7 @@ jwcrypto==1.0
 lazy-object-proxy==1.7.1
 mccabe==0.6.1
 pefile==2021.9.3
-platformdirs==2.4.0
+platformdirs==2.4.1 ; python_version>="3.7"
 pycparser==2.21
 pylint==2.12.2
 python-dateutil==2.8.2
@@ -27,3 +27,4 @@ typing_extensions==4.0.1
 uritemplate==4.1.1
 # urllib3==1.26.7
 wrapt==1.13.3
+platformdirs==2.4.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-pylint.txt-raw b/misc/requirements/requirements-pylint.txt-raw
index 9a2498267..273d07cf4 100644
--- a/misc/requirements/requirements-pylint.txt-raw
+++ b/misc/requirements/requirements-pylint.txt-raw
@@ -13,3 +13,7 @@ pefile
 
 # For pylint_checkers
 #@ pip_args: --use-feature=in-tree-build
+
+# Python 3.6
+#@ markers: platformdirs python_version>="3.7"
+#@ add: platformdirs==2.4.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index fa37c75a5..e3ced54f6 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -9,11 +9,11 @@ click==8.0.3
 coverage==6.2
 EasyProcess==0.3
 execnet==1.9.0
-filelock==3.4.0
+filelock==3.4.2 ; python_version>="3.7"
 Flask==2.0.2
 glob2==0.7
 hunter==3.4.3
-hypothesis==6.31.6
+hypothesis==6.32.1 ; python_version>="3.7"
 icdiff==2.0.4
 idna==3.3
 iniconfig==1.1.1
@@ -60,3 +60,5 @@ vulture==2.3
 Werkzeug==2.0.2
 jaraco.functools<3.5 ; python_version=="3.6.*"
 tomli<2 ; python_version=="3.6.*"
+filelock==3.4.1 ; python_version=="3.6.*"
+hypothesis<6.32 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 22a50679a..ff66280ff 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -41,3 +41,7 @@ tldextract
 #@ add: jaraco.functools<3.5 ; python_version=="3.6.*"
 #@ markers: tomli python_version>="3.7"
 #@ add: tomli<2 ; python_version=="3.6.*"
+#@ markers: filelock python_version>="3.7"
+#@ add: filelock==3.4.1 ; python_version=="3.6.*"
+#@ markers: hypothesis python_version>="3.7"
+#@ add: hypothesis<6.32 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index f9f9e12a2..914a9904f 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -2,17 +2,19 @@
 
 backports.entry-points-selectable==1.1.1
 distlib==0.3.4
-filelock==3.4.0
+filelock==3.4.2 ; python_version>="3.7"
 packaging==21.3
 pip==21.3.1
-platformdirs==2.4.0
+platformdirs==2.4.1 ; python_version>="3.7"
 pluggy==1.0.0
 py==1.11.0
 pyparsing==3.0.6
-setuptools==60.0.0 ; python_version>="3.7"
+setuptools==60.1.0 ; python_version>="3.7"
 six==1.16.0
 toml==0.10.2
 tox==3.24.4
 virtualenv==20.10.0
-wheel==0.37.0
+wheel==0.37.1
 setuptools<60 ; python_version=="3.6.*"
+filelock==3.4.1 ; python_version=="3.6.*"
+platformdirs==2.4.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tox.txt-raw b/misc/requirements/requirements-tox.txt-raw
index 2f7f64b1f..9b1968480 100644
--- a/misc/requirements/requirements-tox.txt-raw
+++ b/misc/requirements/requirements-tox.txt-raw
@@ -1,5 +1,10 @@
 tox
 wheel
 
+# Python 3.6
 #@ markers: setuptools python_version>="3.7"
 #@ add: setuptools<60 ; python_version=="3.6.*"
+#@ markers: filelock python_version>="3.7"
+#@ add: filelock==3.4.1 ; python_version=="3.6.*"
+#@ markers: platformdirs python_version>="3.7"
+#@ add: platformdirs==2.4.0 ; python_version=="3.6.*"
diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py
index 2774d04e4..793f131c8 100644
--- a/qutebrowser/extensions/loader.py
+++ b/qutebrowser/extensions/loader.py
@@ -83,7 +83,7 @@ def add_module_info(module: types.ModuleType) -> ModuleInfo:
     # pylint: disable=protected-access
     if not hasattr(module, '__qute_module_info'):
         module.__qute_module_info = ModuleInfo()  # type: ignore[attr-defined]
-    return module.__qute_module_info  # type: ignore[attr-defined]
+    return module.__qute_module_info
 
 
 def load_components(*, skip_hooks: bool = False) -> None:
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 6677e383e..4853d62ae 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -247,7 +247,9 @@ def disable_qt_msghandler() -> Iterator[None]:
 @contextlib.contextmanager
 def py_warning_filter(action: str = 'ignore', **kwargs: Any) -> Iterator[None]:
     """Contextmanager to temporarily disable certain Python warnings."""
-    warnings.filterwarnings(action, **kwargs)
+    # FIXME Use Literal['default', 'error', 'ignore', 'always', 'module', 'once']
+    # once we use Python 3.8 or typing_extensions
+    warnings.filterwarnings(action, **kwargs)  # type: ignore[arg-type]
     yield
     if _log_inited:
         _init_py_warnings()
@@ -729,8 +731,8 @@ class ColoredFormatter(logging.Formatter):
                  datefmt: str,
                  style: str, *,
                  use_colors: bool) -> None:
-        super().__init__(fmt, datefmt, style)  # type: ignore[arg-type]
         # FIXME Use Literal["%", "{", "$"] once we use Python 3.8 or typing_extensions
+        super().__init__(fmt, datefmt, style)  # type: ignore[arg-type]
         self.use_colors = use_colors
 
     def format(self, record: logging.LogRecord) -> str:
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 9c68932f3..a899fa599 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -300,7 +300,8 @@ def fake_io(write_func: Callable[[str], int]) -> Iterator[None]:
 def disabled_excepthook() -> Iterator[None]:
     """Run code with the exception hook temporarily disabled."""
     old_excepthook = sys.excepthook
-    sys.excepthook = sys.__excepthook__
+    # https://github.com/python/typeshed/pull/6678
+    sys.excepthook = sys.__excepthook__  # type: ignore[assignment]
     try:
         yield
     finally: