From c3f09f61b80378e9ed625dcfa4a32db0e7979b4a Mon Sep 17 00:00:00 2001
From: qutebrowser bot <bot@qutebrowser.org>
Date: Mon, 20 Feb 2023 04:21:03 +0000
Subject: Update dependencies

---
 misc/requirements/requirements-dev.txt         |  6 +++---
 misc/requirements/requirements-flake8.txt      |  4 ++--
 misc/requirements/requirements-mypy.txt        | 10 +++++-----
 misc/requirements/requirements-pyinstaller.txt |  2 +-
 misc/requirements/requirements-pylint.txt      |  4 ++--
 misc/requirements/requirements-sphinx.txt      |  2 +-
 misc/requirements/requirements-tests.txt       | 16 ++++++++--------
 misc/requirements/requirements-tox.txt         |  4 ++--
 requirements.txt                               |  6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 0a5989355..b89d1051e 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -12,7 +12,7 @@ github3.py==3.2.0
 hunter==3.5.1
 idna==3.4
 importlib-metadata==6.0.0
-importlib-resources==5.10.2
+importlib-resources==5.12.0
 jaraco.classes==3.2.3
 jeepney==0.8.0
 keyring==23.13.1
@@ -41,8 +41,8 @@ six==1.16.0
 toml==0.10.2
 tomli==2.0.1
 twine==4.0.2
-typing_extensions==4.4.0
+typing_extensions==4.5.0
 uritemplate==4.1.1
 # urllib3==1.26.14
 webencodings==0.5.1
-zipp==3.13.0
+zipp==3.14.0
diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 38be113bc..c34ed362b 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -2,7 +2,7 @@
 
 attrs==22.2.0
 flake8==6.0.0
-flake8-bugbear==23.1.20
+flake8-bugbear==23.2.13
 flake8-builtins==2.1.0
 flake8-comprehensions==3.10.1
 flake8-debugger==4.1.2
@@ -10,7 +10,7 @@ flake8-deprecated==2.0.1
 flake8-docstrings==1.7.0
 flake8-future-import==0.4.7
 flake8-plugin-utils==1.3.2
-flake8-pytest-style==1.7.0
+flake8-pytest-style==1.7.2
 flake8-string-format==0.3.0
 flake8-tidy-imports==4.8.0
 flake8-tuple==0.4.1
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index b85eba569..b3be6c283 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -3,16 +3,16 @@
 chardet==5.1.0
 diff-cover==7.4.0
 importlib-metadata==6.0.0
-importlib-resources==5.10.2
+importlib-resources==5.12.0
 Jinja2==3.1.2
 lxml==4.9.2
 MarkupSafe==2.1.2
-mypy==1.0.0
+mypy==1.0.1
 mypy-extensions==1.0.0
 pluggy==1.0.0
 Pygments==2.14.0
 PyQt5-stubs==5.15.6.0
 tomli==2.0.1
-types-PyYAML==6.0.12.5
-typing_extensions==4.4.0
-zipp==3.13.0
+types-PyYAML==6.0.12.7
+typing_extensions==4.5.0
+zipp==3.14.0
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index 0505718fb..3f1ec3249 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -2,4 +2,4 @@
 
 altgraph==0.17.3
 pyinstaller==5.8.0
-pyinstaller-hooks-contrib==2022.15
+pyinstaller-hooks-contrib==2023.0
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index fb27166b4..7bb3da4f8 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -15,7 +15,7 @@ pefile==2023.2.7
 platformdirs==3.0.0
 pycparser==2.21
 PyJWT==2.6.0
-pylint==2.16.1
+pylint==2.16.2
 python-dateutil==2.8.2
 ./scripts/dev/pylint_checkers
 requests==2.28.2
@@ -23,7 +23,7 @@ six==1.16.0
 tomli==2.0.1
 tomlkit==0.11.6
 typed-ast==1.5.4 ; python_version<"3.8"
-typing_extensions==4.4.0
+typing_extensions==4.5.0
 uritemplate==4.1.1
 # urllib3==1.26.14
 wrapt==1.14.1
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
index b0017c405..f45f1ec30 100644
--- a/misc/requirements/requirements-sphinx.txt
+++ b/misc/requirements/requirements-sphinx.txt
@@ -23,4 +23,4 @@ sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
 urllib3==1.26.14
-zipp==3.13.0
+zipp==3.14.0
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 224869644..db63570b8 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -10,14 +10,14 @@ coverage==7.1.0
 exceptiongroup==1.1.0
 execnet==1.9.0
 filelock==3.9.0
-Flask==2.2.2
+Flask==2.2.3
 hunter==3.5.1
-hypothesis==6.68.1
+hypothesis==6.68.2
 idna==3.4
 importlib-metadata==6.0.0
 iniconfig==2.0.0
 itsdangerous==2.1.2
-jaraco.functools==3.5.2
+jaraco.functools==3.6.0
 # Jinja2==3.1.2
 Mako==1.2.4
 manhole==1.8.0
@@ -37,7 +37,7 @@ pytest-instafail==0.4.2
 pytest-mock==3.10.0
 pytest-qt==4.2.0
 pytest-repeat==0.9.1
-pytest-rerunfailures==11.1
+pytest-rerunfailures==11.1.1
 pytest-xdist==3.2.0
 pytest-xvfb==2.0.0
 PyVirtualDisplay==3.0
@@ -45,12 +45,12 @@ requests==2.28.2
 requests-file==1.5.1
 six==1.16.0
 sortedcontainers==2.4.0
-soupsieve==2.3.2.post1
+soupsieve==2.4
 tldextract==3.4.0
 toml==0.10.2
 tomli==2.0.1
-typing_extensions==4.4.0
+typing_extensions==4.5.0
 urllib3==1.26.14
 vulture==2.7
-Werkzeug==2.2.2
-zipp==3.13.0
+Werkzeug==2.2.3
+zipp==3.14.0
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 4b07a6055..edc867186 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -6,11 +6,11 @@ colorama==0.4.6
 distlib==0.3.6
 filelock==3.9.0
 packaging==23.0
-pip==23.0
+pip==23.0.1
 platformdirs==3.0.0
 pluggy==1.0.0
 pyproject_api==1.5.0
-setuptools==67.2.0
+setuptools==67.3.2
 tomli==2.0.1
 tox==4.4.5
 virtualenv==20.19.0
diff --git a/requirements.txt b/requirements.txt
index 502aae00c..fe245732f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,13 +3,13 @@
 adblock==0.6.0
 colorama==0.4.6
 importlib-metadata==6.0.0 ; python_version=="3.7.*"
-importlib-resources==5.10.2 ; python_version=="3.7.*" or python_version=="3.8.*"
+importlib-resources==5.12.0 ; python_version=="3.7.*" or python_version=="3.8.*"
 Jinja2==3.1.2
 MarkupSafe==2.1.2
 Pygments==2.14.0
 PyYAML==6.0
-typing_extensions==4.4.0 ; python_version<"3.8"
-zipp==3.13.0
+typing_extensions==4.5.0 ; python_version<"3.8"
+zipp==3.14.0
 # Unpinned due to recompile_requirements.py limitations
 pyobjc-core ; sys_platform=="darwin"
 pyobjc-framework-Cocoa ; sys_platform=="darwin"
-- 
cgit v1.2.3-54-g00ecf


From 47be6f3aeb886cf10f85158af18b13906fc68704 Mon Sep 17 00:00:00 2001
From: toofar <toofar@spalge.com>
Date: Sun, 26 Feb 2023 13:39:35 +1300
Subject: lint: add stacklevel kwarg to warnings

flake8-bugbear B028 No explicit stacklevel keyword argument found. The
warn method from the warnings module uses a stacklevel of 1 by default.
This will only show a stack trace for the line on which the warn method
is called. It is therefore recommended to use a stacklevel of 2 or
greater to provide more information to the user.

Semgrep helped:

    semgrep --lang=py -e 'warnings.warn($ARG)' --replacement 'warnings.warn($ARG, stacklevel=2)' $FILES -a
    semgrep --lang=py -e 'warnings.warn($ARG1, $ARG2)' --replacement 'warnings.warn($ARG1, $ARG2, stacklevel=2)' $FILES -a

Although it did lose the f-string on one of them.
---
 tests/end2end/fixtures/testprocess.py |  2 +-
 tests/test_conftest.py                |  2 +-
 tests/unit/config/test_configtypes.py |  2 +-
 tests/unit/utils/test_log.py          | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 96e700390..9276a4820 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -319,7 +319,7 @@ class Process(QObject):
         if not ok:
             cmdline = ' '.join([self.proc.program()] + self.proc.arguments())
             warnings.warn(f"Test process {cmdline} with PID {self.proc.processId()} "
-                          "failed to terminate!")
+                          "failed to terminate!", stacklevel=2)
             self.proc.kill()
             self.proc.waitForFinished()
 
diff --git a/tests/test_conftest.py b/tests/test_conftest.py
index fedc6b43f..2019bfd0b 100644
--- a/tests/test_conftest.py
+++ b/tests/test_conftest.py
@@ -41,7 +41,7 @@ def test_no_qapp(request):
 
 def test_fail_on_warnings():
     with pytest.raises(PendingDeprecationWarning):
-        warnings.warn('test', PendingDeprecationWarning)
+        warnings.warn('test', PendingDeprecationWarning, stacklevel=2)
 
 
 @pytest.mark.xfail(reason="https://github.com/qutebrowser/qutebrowser/issues/1070",
diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 99b8a5de0..22ac3e9df 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -1521,7 +1521,7 @@ class TestRegex:
         """
         regex = klass()
         m = mocker.patch('qutebrowser.config.configtypes.re')
-        m.compile.side_effect = lambda *args: warnings.warn(warning)
+        m.compile.side_effect = lambda *args: warnings.warn(warning, stacklevel=2)
         m.error = re.error
         with pytest.raises(type(warning)):
             regex.to_py('foo')
diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py
index bbc6b02db..0a03ea7ee 100644
--- a/tests/unit/utils/test_log.py
+++ b/tests/unit/utils/test_log.py
@@ -275,7 +275,7 @@ class TestInitLog:
         log.init_log(args)
 
         with caplog.at_level(logging.WARNING):
-            warnings.warn("test warning", PendingDeprecationWarning)
+            warnings.warn("test warning", PendingDeprecationWarning, stacklevel=2)
 
         expected = "PendingDeprecationWarning: test warning"
         assert expected in caplog.records[0].message
@@ -285,7 +285,7 @@ class TestInitLog:
         log.init_log(args)
 
         with pytest.raises(PendingDeprecationWarning):
-            warnings.warn("test warning", PendingDeprecationWarning)
+            warnings.warn("test warning", PendingDeprecationWarning, stacklevel=2)
 
     @pytest.mark.parametrize('cli, conf, expected', [
         (None, 'info', logging.INFO),
@@ -386,9 +386,9 @@ def test_stub(caplog, suffix, expected):
 def test_py_warning_filter(caplog):
     logging.captureWarnings(True)
     with log.py_warning_filter(category=UserWarning):
-        warnings.warn("hidden", UserWarning)
+        warnings.warn("hidden", UserWarning, stacklevel=2)
     with caplog.at_level(logging.WARNING):
-        warnings.warn("not hidden", UserWarning)
+        warnings.warn("not hidden", UserWarning, stacklevel=2)
     assert len(caplog.records) == 1
     msg = caplog.messages[0].splitlines()[0]
     assert msg.endswith("UserWarning: not hidden")
@@ -396,17 +396,17 @@ def test_py_warning_filter(caplog):
 
 def test_py_warning_filter_error(caplog):
     warnings.simplefilter('ignore')
-    warnings.warn("hidden", UserWarning)
+    warnings.warn("hidden", UserWarning, stacklevel=2)
 
     with log.py_warning_filter('error'):
         with pytest.raises(UserWarning):
-            warnings.warn("error", UserWarning)
+            warnings.warn("error", UserWarning, stacklevel=2)
 
 
 def test_warning_still_errors():
     # Mainly a sanity check after the tests messing with warnings above.
     with pytest.raises(UserWarning):
-        warnings.warn("error", UserWarning)
+        warnings.warn("error", UserWarning, stacklevel=2)
 
 
 class TestQtMessageHandler:
-- 
cgit v1.2.3-54-g00ecf