diff options
author | Florian Bruhin <me@the-compiler.org> | 2023-03-23 17:34:39 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2023-03-23 17:34:39 +0100 |
commit | 7c222c5b196e492ca7b30e753d775d6677461d6c (patch) | |
tree | 8cd664e9ea7c72feb495360ad2e0ff1088ae08f8 | |
parent | 0510ffcfa90a01091064e81d8d180c5d81f54b1f (diff) | |
parent | dbc7871b47c30001aa98ed916117611d3c042505 (diff) | |
download | qutebrowser-7c222c5b196e492ca7b30e753d775d6677461d6c.tar.gz qutebrowser-7c222c5b196e492ca7b30e753d775d6677461d6c.zip |
Merge branch 'update-dependencies'
21 files changed, 60 insertions, 57 deletions
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index 7c991e3d5..f67ecc73c 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -5,13 +5,13 @@ build==0.10.0 bump2version==1.0.1 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 cryptography==39.0.2 docutils==0.19 github3.py==3.2.0 hunter==3.5.1 idna==3.4 -importlib-metadata==6.0.0 +importlib-metadata==6.1.0 importlib-resources==5.12.0 jaraco.classes==3.2.3 jeepney==0.8.0 @@ -43,6 +43,6 @@ tomli==2.0.1 twine==4.0.2 typing_extensions==4.5.0 uritemplate==4.1.1 -# urllib3==1.26.14 +# urllib3==1.26.15 webencodings==0.5.1 zipp==3.15.0 diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index c34ed362b..b15db3375 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -2,9 +2,9 @@ attrs==22.2.0 flake8==6.0.0 -flake8-bugbear==23.2.13 +flake8-bugbear==23.3.12 flake8-builtins==2.1.0 -flake8-comprehensions==3.10.1 +flake8-comprehensions==3.11.0 flake8-debugger==4.1.2 flake8-deprecated==2.0.1 flake8-docstrings==1.7.0 diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index 71e0acde1..c39890073 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -2,12 +2,12 @@ chardet==5.1.0 diff-cover==7.5.0 -importlib-metadata==6.0.0 +importlib-metadata==6.1.0 importlib-resources==5.12.0 Jinja2==3.1.2 lxml==4.9.2 MarkupSafe==2.1.2 -mypy==1.0.1 +mypy==1.1.1 mypy-extensions==1.0.0 pluggy==1.0.0 Pygments==2.14.0 diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt index 3f1ec3249..95efdb611 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.3 -pyinstaller==5.8.0 -pyinstaller-hooks-contrib==2023.0 +pyinstaller==5.9.0 +pyinstaller-hooks-contrib==2023.1 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 657c8ba80..c09e7abe9 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -3,7 +3,7 @@ astroid==2.15.0 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 cryptography==39.0.2 dill==0.3.6 github3.py==3.2.0 @@ -12,10 +12,10 @@ isort==5.11.5 lazy-object-proxy==1.9.0 mccabe==0.7.0 pefile==2023.2.7 -platformdirs==3.1.0 +platformdirs==3.1.1 pycparser==2.21 PyJWT==2.6.0 -pylint==2.16.3 +pylint==2.17.0 python-dateutil==2.8.2 ./scripts/dev/pylint_checkers requests==2.28.2 @@ -25,5 +25,5 @@ tomlkit==0.11.6 typed-ast==1.5.4 ; python_version<"3.8" typing_extensions==4.5.0 uritemplate==4.1.1 -# urllib3==1.26.14 +# urllib3==1.26.15 wrapt==1.15.0 diff --git a/misc/requirements/requirements-pyqt-5.15.2.txt b/misc/requirements/requirements-pyqt-5.15.2.txt index 986bb42c1..4a47378b8 100644 --- a/misc/requirements/requirements-pyqt-5.15.2.txt +++ b/misc/requirements/requirements-pyqt-5.15.2.txt @@ -1,5 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py PyQt5==5.15.2 # rq.filter: == 5.15.2 -PyQt5-sip==12.10.1 +PyQt5-sip==12.11.1 PyQtWebEngine==5.15.2 # rq.filter: == 5.15.2 diff --git a/misc/requirements/requirements-pyqt-5.txt b/misc/requirements/requirements-pyqt-5.txt index 1641b4fcd..38b25477b 100644 --- a/misc/requirements/requirements-pyqt-5.txt +++ b/misc/requirements/requirements-pyqt-5.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt5==5.15.6 +PyQt5==5.15.9 PyQt5-Qt5==5.15.2 -PyQt5-sip==12.10.1 -PyQtWebEngine==5.15.5 +PyQt5-sip==12.11.1 +PyQtWebEngine==5.15.6 PyQtWebEngine-Qt5==5.15.2 diff --git a/misc/requirements/requirements-pyqt-6.2.txt b/misc/requirements/requirements-pyqt-6.2.txt index c41148a06..2e716f59d 100644 --- a/misc/requirements/requirements-pyqt-6.2.txt +++ b/misc/requirements/requirements-pyqt-6.2.txt @@ -2,6 +2,6 @@ PyQt6==6.2.3 PyQt6-Qt6==6.2.4 -PyQt6-sip==13.3.1 +PyQt6-sip==13.4.1 PyQt6-WebEngine==6.2.1 PyQt6-WebEngine-Qt6==6.2.4 diff --git a/misc/requirements/requirements-pyqt-6.3.txt b/misc/requirements/requirements-pyqt-6.3.txt index cdd830e00..ffc4b3f6e 100644 --- a/misc/requirements/requirements-pyqt-6.3.txt +++ b/misc/requirements/requirements-pyqt-6.3.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py PyQt6==6.3.1 -PyQt6-Qt6==6.3.1 -PyQt6-sip==13.4.0 +PyQt6-Qt6==6.3.2 +PyQt6-sip==13.4.1 PyQt6-WebEngine==6.3.1 -PyQt6-WebEngine-Qt6==6.3.1 +PyQt6-WebEngine-Qt6==6.3.2 diff --git a/misc/requirements/requirements-pyqt-6.4.txt b/misc/requirements/requirements-pyqt-6.4.txt index 91f45c849..61e097b91 100644 --- a/misc/requirements/requirements-pyqt-6.4.txt +++ b/misc/requirements/requirements-pyqt-6.4.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.4.0 -PyQt6-Qt6==6.4.1 -PyQt6-sip==13.4.0 +PyQt6==6.4.2 +PyQt6-Qt6==6.4.2 +PyQt6-sip==13.4.1 PyQt6-WebEngine==6.4.0 -PyQt6-WebEngine-Qt6==6.4.1 +PyQt6-WebEngine-Qt6==6.4.2 diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt index cdd830e00..61e097b91 100644 --- a/misc/requirements/requirements-pyqt-6.txt +++ b/misc/requirements/requirements-pyqt-6.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.3.1 -PyQt6-Qt6==6.3.1 -PyQt6-sip==13.4.0 -PyQt6-WebEngine==6.3.1 -PyQt6-WebEngine-Qt6==6.3.1 +PyQt6==6.4.2 +PyQt6-Qt6==6.4.2 +PyQt6-sip==13.4.1 +PyQt6-WebEngine==6.4.0 +PyQt6-WebEngine-Qt6==6.4.2 diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt index 116090665..42bf2af1d 100644 --- a/misc/requirements/requirements-pyroma.txt +++ b/misc/requirements/requirements-pyroma.txt @@ -2,7 +2,7 @@ build==0.10.0 certifi==2022.12.7 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 docutils==0.19 idna==3.4 packaging==23.0 @@ -11,5 +11,5 @@ pyproject_hooks==1.0.0 pyroma==4.2 requests==2.28.2 tomli==2.0.1 -trove-classifiers==2023.2.20 -urllib3==1.26.14 +trove-classifiers==2023.3.9 +urllib3==1.26.15 diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index fe1d3d001..7e3ffe537 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -3,11 +3,11 @@ alabaster==0.7.13 Babel==2.12.1 certifi==2022.12.7 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 docutils==0.19 idna==3.4 imagesize==1.4.1 -importlib-metadata==6.0.0 +importlib-metadata==6.1.0 Jinja2==3.1.2 MarkupSafe==2.1.2 packaging==23.0 @@ -22,5 +22,5 @@ sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -urllib3==1.26.14 +urllib3==1.26.15 zipp==3.15.0 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 1a93db3fa..d0238c31a 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -3,18 +3,18 @@ attrs==22.2.0 beautifulsoup4==4.11.2 certifi==2022.12.7 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 cheroot==9.0.0 click==8.1.3 -coverage==7.2.1 -exceptiongroup==1.1.0 +coverage==7.2.2 +exceptiongroup==1.1.1 execnet==1.9.0 -filelock==3.9.0 +filelock==3.10.0 Flask==2.2.3 hunter==3.5.1 -hypothesis==6.68.2 +hypothesis==6.70.0 idna==3.4 -importlib-metadata==6.0.0 +importlib-metadata==6.1.0 iniconfig==2.0.0 itsdangerous==2.1.2 jaraco.functools==3.6.0 @@ -37,8 +37,8 @@ pytest-instafail==0.4.2 pytest-mock==3.10.0 pytest-qt==4.2.0 pytest-repeat==0.9.1 -pytest-rerunfailures==11.1.1 -pytest-xdist==3.2.0 +pytest-rerunfailures==11.1.2 +pytest-xdist==3.2.1 pytest-xvfb==2.0.0 PyVirtualDisplay==3.0 requests==2.28.2 @@ -50,7 +50,7 @@ tldextract==3.4.0 toml==0.10.2 tomli==2.0.1 typing_extensions==4.5.0 -urllib3==1.26.14 +urllib3==1.26.15 vulture==2.7 Werkzeug==2.2.3 zipp==3.15.0 diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index ae958a44c..fdb2f21bd 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -4,14 +4,14 @@ cachetools==5.3.0 chardet==5.1.0 colorama==0.4.6 distlib==0.3.6 -filelock==3.9.0 +filelock==3.10.0 packaging==23.0 pip==23.0.1 -platformdirs==3.1.0 +platformdirs==3.1.1 pluggy==1.0.0 -pyproject_api==1.5.0 -setuptools==67.5.0 +pyproject_api==1.5.1 +setuptools==67.6.0 tomli==2.0.1 -tox==4.4.6 -virtualenv==20.20.0 -wheel==0.38.4 +tox==4.4.7 +virtualenv==20.21.0 +wheel==0.40.0 diff --git a/misc/requirements/requirements-yamllint.txt b/misc/requirements/requirements-yamllint.txt index 9ffdfc511..3ce8fc21f 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.11.0 +pathspec==0.11.1 PyYAML==6.0 yamllint==1.29.0 diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py index 9a0deffc5..652477663 100644 --- a/qutebrowser/keyinput/keyutils.py +++ b/qutebrowser/keyinput/keyutils.py @@ -68,7 +68,8 @@ _MODIFIER_MAP = { } try: - _NIL_KEY: Union[Qt.Key, int] = Qt.Key(0) + # WORKAROUND for https://github.com/PyCQA/pylint/issues/8487 + _NIL_KEY: Union[Qt.Key, int] = Qt.Key(0) # pylint: disable=invalid-name except ValueError: # WORKAROUND for # https://www.riverbankcomputing.com/pipermail/pyqt/2022-April/044607.html diff --git a/qutebrowser/misc/objects.py b/qutebrowser/misc/objects.py index 63a9cb2dd..6dcecaf93 100644 --- a/qutebrowser/misc/objects.py +++ b/qutebrowser/misc/objects.py @@ -43,6 +43,8 @@ class NoBackend: raise AssertionError("No backend set!") +# WORKAROUND for https://github.com/PyCQA/pylint/issues/8487 +# pylint: disable-next=invalid-name backend: Union['usertypes.Backend', NoBackend] = NoBackend() commands: Dict[str, 'command.Command'] = {} debug_flags: Set[str] = set() diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index bd2746337..b049f9cf1 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -270,7 +270,7 @@ class FakeIOStream(io.TextIOBase): def __init__(self, write_func: Callable[[str], int]) -> None: super().__init__() - self.write = write_func # type: ignore[assignment] + self.write = write_func # type: ignore[method-assign] @contextlib.contextmanager diff --git a/requirements.txt b/requirements.txt index 87652ace0..00b3c9122 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ adblock==0.6.0 colorama==0.4.6 -importlib-metadata==6.0.0 ; python_version=="3.7.*" +importlib-metadata==6.1.0 ; python_version=="3.7.*" importlib-resources==5.12.0 ; python_version=="3.7.*" or python_version=="3.8.*" Jinja2==3.1.2 MarkupSafe==2.1.2 diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json index 1946017b3..67820cd47 100644 --- a/scripts/dev/changelog_urls.json +++ b/scripts/dev/changelog_urls.json @@ -47,7 +47,7 @@ "flake8-bugbear": "https://github.com/PyCQA/flake8-bugbear#change-log", "flake8-tidy-imports": "https://github.com/adamchainz/flake8-tidy-imports/blob/main/HISTORY.rst", "flake8-tuple": "https://github.com/ar4s/flake8_tuple/blob/master/HISTORY.rst", - "flake8-comprehensions": "https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst", + "flake8-comprehensions": "https://github.com/adamchainz/flake8-comprehensions/blob/main/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-string-format": "https://github.com/xZise/flake8-string-format#changes", |