From 2d04e37a9fc2678ec588aa6885b18105a548d077 Mon Sep 17 00:00:00 2001
From: qutebrowser bot <bot@qutebrowser.org>
Date: Mon, 1 Aug 2022 04:48:27 +0000
Subject: Update dependencies

---
 misc/requirements/requirements-check-manifest.txt |  2 +-
 misc/requirements/requirements-dev.txt            |  4 ++--
 misc/requirements/requirements-flake8.txt         | 10 +++++-----
 misc/requirements/requirements-mypy.txt           |  6 +++---
 misc/requirements/requirements-pyinstaller.txt    |  2 +-
 misc/requirements/requirements-pylint.txt         |  2 +-
 misc/requirements/requirements-pyroma.txt         |  4 ++--
 misc/requirements/requirements-sphinx.txt         |  6 +++---
 misc/requirements/requirements-tests.txt          |  8 ++++----
 misc/requirements/requirements-tox.txt            |  6 +++---
 requirements.txt                                  |  2 +-
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/misc/requirements/requirements-check-manifest.txt b/misc/requirements/requirements-check-manifest.txt
index c51ef3d0e..1eee9b06c 100644
--- a/misc/requirements/requirements-check-manifest.txt
+++ b/misc/requirements/requirements-check-manifest.txt
@@ -3,6 +3,6 @@
 build==0.8.0
 check-manifest==0.48
 packaging==21.3
-pep517==0.12.0
+pep517==0.13.0
 pyparsing==3.0.9
 tomli==2.0.1
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 2cffc7072..8a44d5b7a 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -17,7 +17,7 @@ jeepney==0.8.0
 keyring==23.7.0
 manhole==1.8.0
 packaging==21.3
-pep517==0.12.0
+pep517==0.13.0
 pkginfo==1.8.3
 ply==3.11
 pycparser==2.21
@@ -40,6 +40,6 @@ tomli==2.0.1
 twine==4.0.1
 typing_extensions==4.3.0
 uritemplate==4.1.1
-# urllib3==1.26.10
+# urllib3==1.26.11
 webencodings==0.5.1
 zipp==3.8.1
diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 1a030f600..00e91086a 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==21.4.0
-flake8==4.0.1
+attrs==22.1.0
+flake8==5.0.1
 flake8-bugbear==22.7.1
 flake8-builtins==1.5.3
 flake8-comprehensions==3.10.0
@@ -16,10 +16,10 @@ flake8-pytest-style==1.6.0
 flake8-string-format==0.3.0
 flake8-tidy-imports==4.8.0
 flake8-tuple==0.4.1
-mccabe==0.6.1
+mccabe==0.7.0
 pep8-naming==0.13.1
-pycodestyle==2.8.0
+pycodestyle==2.9.0
 pydocstyle==6.1.1
-pyflakes==2.4.0
+pyflakes==2.5.0
 six==1.16.0
 snowballstemmer==2.2.0
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index 5c2920626..8d87f901a 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -3,16 +3,16 @@
 chardet==5.0.0
 diff-cover==6.5.1
 importlib-metadata==4.12.0
-importlib-resources==5.8.0
+importlib-resources==5.9.0
 Jinja2==3.1.2
 lxml==4.9.1
 MarkupSafe==2.1.1
-mypy==0.961
+mypy==0.971
 mypy-extensions==0.4.3
 pluggy==1.0.0
 Pygments==2.12.0
 PyQt5-stubs==5.15.6.0
 tomli==2.0.1
-types-PyYAML==6.0.10
+types-PyYAML==6.0.11
 typing_extensions==4.3.0
 zipp==3.8.1
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index 890568856..3db372d82 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 altgraph==0.17.2
-pyinstaller==5.2
+pyinstaller==5.3
 pyinstaller-hooks-contrib==2022.8
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 59b0c5eec..711cc9a14 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -26,5 +26,5 @@ tomlkit==0.11.1
 typed-ast==1.5.4 ; python_version<"3.8"
 typing_extensions==4.3.0
 uritemplate==4.1.1
-# urllib3==1.26.10
+# urllib3==1.26.11
 wrapt==1.14.1
diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt
index 233c0c875..826930f00 100644
--- a/misc/requirements/requirements-pyroma.txt
+++ b/misc/requirements/requirements-pyroma.txt
@@ -6,10 +6,10 @@ charset-normalizer==2.1.0
 docutils==0.19
 idna==3.3
 packaging==21.3
-pep517==0.12.0
+pep517==0.13.0
 Pygments==2.12.0
 pyparsing==3.0.9
 pyroma==4.0
 requests==2.28.1
 tomli==2.0.1
-urllib3==1.26.10
+urllib3==1.26.11
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
index a62b63862..8292c6d45 100644
--- a/misc/requirements/requirements-sphinx.txt
+++ b/misc/requirements/requirements-sphinx.txt
@@ -4,7 +4,7 @@ alabaster==0.7.12
 Babel==2.10.3
 certifi==2022.6.15
 charset-normalizer==2.1.0
-docutils==0.18.1
+docutils==0.19
 idna==3.3
 imagesize==1.4.1
 importlib-metadata==4.12.0
@@ -16,12 +16,12 @@ pyparsing==3.0.9
 pytz==2022.1
 requests==2.28.1
 snowballstemmer==2.2.0
-Sphinx==5.0.2
+Sphinx==5.1.1
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
 sphinxcontrib-htmlhelp==2.0.0
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
-urllib3==1.26.10
+urllib3==1.26.11
 zipp==3.8.1
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 320b95c9a..d1a06eb43 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==21.4.0
+attrs==22.1.0
 beautifulsoup4==4.11.1
 certifi==2022.6.15
 charset-normalizer==2.1.0
@@ -13,7 +13,7 @@ filelock==3.7.1
 Flask==2.1.3
 glob2==0.7
 hunter==3.4.3
-hypothesis==6.52.1
+hypothesis==6.53.0
 idna==3.3
 importlib-metadata==4.12.0
 iniconfig==1.1.1
@@ -53,7 +53,7 @@ soupsieve==2.3.2.post1
 tldextract==3.3.1
 toml==0.10.2
 tomli==2.0.1
-urllib3==1.26.10
+urllib3==1.26.11
 vulture==2.5
-Werkzeug==2.1.2
+Werkzeug==2.2.1
 zipp==3.8.1
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 63a22b905..e6cdb619a 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -3,14 +3,14 @@
 distlib==0.3.5
 filelock==3.7.1
 packaging==21.3
-pip==22.1.2
+pip==22.2.1
 platformdirs==2.5.2
 pluggy==1.0.0
 py==1.11.0
 pyparsing==3.0.9
-setuptools==63.2.0
+setuptools==63.3.0
 six==1.16.0
 toml==0.10.2
 tox==3.25.1
-virtualenv==20.15.1
+virtualenv==20.16.2
 wheel==0.37.1
diff --git a/requirements.txt b/requirements.txt
index f898302f0..3cced8747 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 adblock==0.6.0
 colorama==0.4.5
 importlib-metadata==4.12.0 ; python_version=="3.7.*"
-importlib-resources==5.8.0 ; python_version=="3.7.*" or python_version=="3.8.*"
+importlib-resources==5.9.0 ; python_version=="3.7.*" or python_version=="3.8.*"
 Jinja2==3.1.2
 MarkupSafe==2.1.1
 Pygments==2.12.0
-- 
cgit v1.2.3-54-g00ecf


From c9aadef48841c8cc8b619064102f9bfee6b82d30 Mon Sep 17 00:00:00 2001
From: toofar <toofar@spalge.com>
Date: Mon, 1 Aug 2022 20:19:03 +1200
Subject: mypy: Remove no longer needed ignore comments

Came through with 0.961	-> 0.971.
Not entirely sure why what change caused them not to be needed but oh
well.
---
 .flake8                  | 1 +
 qutebrowser/utils/log.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.flake8 b/.flake8
index 34a829a4b..5a3a1684a 100644
--- a/.flake8
+++ b/.flake8
@@ -68,6 +68,7 @@ per-file-ignores =
 copyright-check = True
 copyright-regexp = # Copyright [\d-]+ .*
 copyright-min-file-size = 110
+select = E,F,W,C
 pytest-fixture-no-parentheses = True
 pytest-mark-no-parentheses = True
 pytest-parametrize-names-type = csv
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 22035e074..db72e1a21 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -780,9 +780,9 @@ class HTMLFormatter(logging.Formatter):
         if record_clone.levelname in self._log_colors:
             color = self._log_colors[record_clone.levelname]
             color_str = self._colordict[color]
-            record_clone.log_color = color_str  # type: ignore[attr-defined]
+            record_clone.log_color = color_str
         else:
-            record_clone.log_color = ''  # type: ignore[attr-defined]
+            record_clone.log_color = ''
         for field in ['msg', 'filename', 'funcName', 'levelname', 'module',
                       'name', 'pathname', 'processName', 'threadName']:
             data = str(getattr(record_clone, field))
-- 
cgit v1.2.3-54-g00ecf


From 45c585bf65868c23f8c80616beb52295f9461549 Mon Sep 17 00:00:00 2001
From: toofar <toofar@spalge.com>
Date: Mon, 1 Aug 2022 21:01:53 +1200
Subject: revert accidental .flake8 change

---
 .flake8 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.flake8 b/.flake8
index 5a3a1684a..34a829a4b 100644
--- a/.flake8
+++ b/.flake8
@@ -68,7 +68,6 @@ per-file-ignores =
 copyright-check = True
 copyright-regexp = # Copyright [\d-]+ .*
 copyright-min-file-size = 110
-select = E,F,W,C
 pytest-fixture-no-parentheses = True
 pytest-mark-no-parentheses = True
 pytest-parametrize-names-type = csv
-- 
cgit v1.2.3-54-g00ecf


From faf04f3791e533b5b6d69282e4bf063032eca419 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 1 Aug 2022 13:35:34 +0200
Subject: flake8: Remove broken plugins

https://github.com/PyCQA/flake8/issues/325
https://github.com/savoirfairelinux/flake8-copyright/pull/9
https://github.com/xZise/flake8-future-import/issues/25
https://github.com/aleGpereira/flake8-mock/issues/10
---
 misc/requirements/requirements-flake8.txt     | 3 ---
 misc/requirements/requirements-flake8.txt-raw | 7 ++++---
 scripts/dev/changelog_urls.json               | 3 ---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 00e91086a..cf42b751c 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -5,12 +5,9 @@ flake8==5.0.1
 flake8-bugbear==22.7.1
 flake8-builtins==1.5.3
 flake8-comprehensions==3.10.0
-flake8-copyright==0.2.2
 flake8-debugger==4.1.2
 flake8-deprecated==1.3
 flake8-docstrings==1.6.0
-flake8-future-import==0.4.6
-flake8-mock==0.3
 flake8-plugin-utils==1.3.2
 flake8-pytest-style==1.6.0
 flake8-string-format==0.3.0
diff --git a/misc/requirements/requirements-flake8.txt-raw b/misc/requirements/requirements-flake8.txt-raw
index 59908897c..5d24b8494 100644
--- a/misc/requirements/requirements-flake8.txt-raw
+++ b/misc/requirements/requirements-flake8.txt-raw
@@ -2,12 +2,13 @@ flake8
 flake8-bugbear
 flake8-builtins
 flake8-comprehensions
-flake8-copyright
 flake8-debugger
 flake8-deprecated
 flake8-docstrings
-flake8-future-import
-flake8-mock
+# https://github.com/PyCQA/flake8/issues/325
+# flake8-copyright
+# flake8-future-import
+# flake8-mock
 flake8-string-format
 flake8-tidy-imports
 flake8-tuple
diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json
index f62542472..ad88d717b 100644
--- a/scripts/dev/changelog_urls.json
+++ b/scripts/dev/changelog_urls.json
@@ -49,10 +49,7 @@
   "flake8-tidy-imports": "https://github.com/adamchainz/flake8-tidy-imports/blob/master/HISTORY.rst",
   "flake8-tuple": "https://github.com/ar4s/flake8_tuple/blob/master/HISTORY.rst",
   "flake8-comprehensions": "https://github.com/adamchainz/flake8-comprehensions/blob/master/HISTORY.rst",
-  "flake8-copyright": "https://github.com/savoirfairelinux/flake8-copyright/blob/master/CHANGELOG.rst",
   "flake8-deprecated": "https://github.com/gforcada/flake8-deprecated/blob/master/CHANGES.rst",
-  "flake8-future-import": "https://github.com/xZise/flake8-future-import#changes",
-  "flake8-mock": "https://github.com/aleGpereira/flake8-mock#changes",
   "flake8-string-format": "https://github.com/xZise/flake8-string-format#changes",
   "flake8-plugin-utils": "https://github.com/afonasev/flake8-plugin-utils#change-log",
   "flake8-pytest-style": "https://github.com/m-burst/flake8-pytest-style#change-log",
-- 
cgit v1.2.3-54-g00ecf