From c20c19625079e5079b0baa73df92b98cbf28ae29 Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Mon, 16 Oct 2023 04:24:13 +0000 Subject: Update dependencies --- misc/requirements/requirements-dev.txt | 4 ++-- misc/requirements/requirements-flake8.txt | 2 +- misc/requirements/requirements-mypy.txt | 4 ++-- misc/requirements/requirements-pyinstaller.txt | 2 +- misc/requirements/requirements-pylint.txt | 2 +- misc/requirements/requirements-pyqt-5.15.2.txt | 2 +- misc/requirements/requirements-pyqt-5.15.txt | 4 ++-- misc/requirements/requirements-pyqt-5.txt | 4 ++-- misc/requirements/requirements-pyqt-6.2.txt | 2 +- misc/requirements/requirements-pyqt-6.3.txt | 2 +- misc/requirements/requirements-pyqt-6.4.txt | 2 +- misc/requirements/requirements-pyqt-6.5.txt | 8 ++++---- misc/requirements/requirements-pyqt-6.txt | 8 ++++---- misc/requirements/requirements-pyqt.txt | 8 ++++---- misc/requirements/requirements-tests.txt | 8 ++++---- misc/requirements/requirements-tox.txt | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index c51b2bf41..65adceac5 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -28,7 +28,7 @@ Pygments==2.16.1 PyJWT==2.8.0 Pympler==1.0.1 pyproject_hooks==1.0.0 -PyQt-builder==1.15.2 +PyQt-builder==1.15.3 python-dateutil==2.8.2 readme-renderer==42.0 requests==2.31.0 @@ -36,7 +36,7 @@ requests-toolbelt==1.0.0 rfc3986==2.0.0 rich==13.6.0 SecretStorage==3.3.3 -sip==6.7.11 +sip==6.7.12 six==1.16.0 tomli==2.0.1 twine==4.0.2 diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 5df42a5dc..95a9cb382 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -16,7 +16,7 @@ flake8-tidy-imports==4.10.0 flake8-tuple==0.4.1 mccabe==0.7.0 pep8-naming==0.13.3 -pycodestyle==2.11.0 +pycodestyle==2.11.1 pydocstyle==6.3.0 pyflakes==3.1.0 six==1.16.0 diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index 72f5ae5dc..418611aae 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -1,12 +1,12 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py chardet==5.2.0 -diff-cover==7.7.0 +diff_cover==8.0.0 importlib-resources==6.1.0 Jinja2==3.1.2 lxml==4.9.3 MarkupSafe==2.1.3 -mypy==1.5.1 +mypy==1.6.0 mypy-extensions==1.0.0 pluggy==1.3.0 Pygments==2.16.1 diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt index bb4bb53fe..84f35ea61 100644 --- a/misc/requirements/requirements-pyinstaller.txt +++ b/misc/requirements/requirements-pyinstaller.txt @@ -2,4 +2,4 @@ altgraph==0.17.4 pyinstaller @ git+https://github.com/pyinstaller/pyinstaller.git@79f62ef29822169ae00cd4271390d0e3175476ad -pyinstaller-hooks-contrib==2023.9 +pyinstaller-hooks-contrib==2023.10 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 073894108..a3821428a 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -1,6 +1,6 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -astroid==3.0.0 +astroid==3.0.1 certifi==2023.7.22 cffi==1.16.0 charset-normalizer==3.3.0 diff --git a/misc/requirements/requirements-pyqt-5.15.2.txt b/misc/requirements/requirements-pyqt-5.15.2.txt index 3feba9550..41f75871e 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.12.2 +PyQt5-sip==12.13.0 PyQtWebEngine==5.15.2 # rq.filter: == 5.15.2 diff --git a/misc/requirements/requirements-pyqt-5.15.txt b/misc/requirements/requirements-pyqt-5.15.txt index 6bb4f43fe..5f9e4828e 100644 --- a/misc/requirements/requirements-pyqt-5.15.txt +++ b/misc/requirements/requirements-pyqt-5.15.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt5==5.15.9 # rq.filter: < 5.16 +PyQt5==5.15.10 # rq.filter: < 5.16 PyQt5-Qt5==5.15.2 -PyQt5-sip==12.12.2 +PyQt5-sip==12.13.0 PyQtWebEngine==5.15.6 # rq.filter: < 5.16 PyQtWebEngine-Qt5==5.15.2 diff --git a/misc/requirements/requirements-pyqt-5.txt b/misc/requirements/requirements-pyqt-5.txt index d3d62f86c..e8ee2b9c7 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.9 +PyQt5==5.15.10 PyQt5-Qt5==5.15.2 -PyQt5-sip==12.12.2 +PyQt5-sip==12.13.0 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 52bcb2ebd..e90769ddd 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.5.2 +PyQt6-sip==13.6.0 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 f1b67880b..d82c623c3 100644 --- a/misc/requirements/requirements-pyqt-6.3.txt +++ b/misc/requirements/requirements-pyqt-6.3.txt @@ -2,6 +2,6 @@ PyQt6==6.3.1 PyQt6-Qt6==6.3.2 -PyQt6-sip==13.5.2 +PyQt6-sip==13.6.0 PyQt6-WebEngine==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 c9ff85771..b52e8a511 100644 --- a/misc/requirements/requirements-pyqt-6.4.txt +++ b/misc/requirements/requirements-pyqt-6.4.txt @@ -2,6 +2,6 @@ PyQt6==6.4.2 PyQt6-Qt6==6.4.3 -PyQt6-sip==13.5.2 +PyQt6-sip==13.6.0 PyQt6-WebEngine==6.4.0 PyQt6-WebEngine-Qt6==6.4.3 diff --git a/misc/requirements/requirements-pyqt-6.5.txt b/misc/requirements/requirements-pyqt-6.5.txt index cccbc20b7..5dca9ab74 100644 --- a/misc/requirements/requirements-pyqt-6.5.txt +++ b/misc/requirements/requirements-pyqt-6.5.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.5.2 -PyQt6-Qt6==6.5.2 -PyQt6-sip==13.5.2 +PyQt6==6.5.3 +PyQt6-Qt6==6.5.3 +PyQt6-sip==13.6.0 PyQt6-WebEngine==6.5.0 -PyQt6-WebEngine-Qt6==6.5.2 +PyQt6-WebEngine-Qt6==6.5.3 diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt index cccbc20b7..5dca9ab74 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.5.2 -PyQt6-Qt6==6.5.2 -PyQt6-sip==13.5.2 +PyQt6==6.5.3 +PyQt6-Qt6==6.5.3 +PyQt6-sip==13.6.0 PyQt6-WebEngine==6.5.0 -PyQt6-WebEngine-Qt6==6.5.2 +PyQt6-WebEngine-Qt6==6.5.3 diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index cccbc20b7..5dca9ab74 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.5.2 -PyQt6-Qt6==6.5.2 -PyQt6-sip==13.5.2 +PyQt6==6.5.3 +PyQt6-Qt6==6.5.3 +PyQt6-sip==13.6.0 PyQt6-WebEngine==6.5.0 -PyQt6-WebEngine-Qt6==6.5.2 +PyQt6-WebEngine-Qt6==6.5.3 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 137663b10..b772d87f8 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -13,7 +13,7 @@ execnet==2.0.2 filelock==3.12.4 Flask==3.0.0 hunter==3.6.1 -hypothesis==6.87.3 +hypothesis==6.88.0 idna==3.4 importlib-metadata==6.8.0 iniconfig==2.0.0 @@ -31,13 +31,13 @@ pluggy==1.3.0 py-cpuinfo==9.0.0 Pygments==2.16.1 pytest==7.4.2 -pytest-bdd==6.1.1 +pytest-bdd==7.0.0 pytest-benchmark==4.0.0 pytest-cov==4.1.0 pytest-instafail==0.5.0 pytest-mock==3.11.1 pytest-qt==4.2.0 -pytest-repeat==0.9.2 +pytest-repeat==0.9.3 pytest-rerunfailures==12.0 pytest-xdist==3.3.1 pytest-xvfb==3.0.0 @@ -47,7 +47,7 @@ requests-file==1.5.1 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.5 -tldextract==3.6.0 +tldextract==5.0.0 toml==0.10.2 tomli==2.0.1 typing_extensions==4.8.0 diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 00755bbbf..4c719ce5b 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -6,7 +6,7 @@ colorama==0.4.6 distlib==0.3.7 filelock==3.12.4 packaging==23.2 -pip==23.2.1 +pip==23.3 platformdirs==3.11.0 pluggy==1.3.0 pyproject-api==1.6.1 -- cgit v1.2.3-54-g00ecf From a087b8145182412534df9e32388d58a45ec815e5 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 16 Oct 2023 21:24:34 +0200 Subject: Adjust for mypy 1.6 See https://mypy-lang.blogspot.com/2023/10/mypy-16-released.html --- qutebrowser/keyinput/modeparsers.py | 2 +- qutebrowser/misc/checkpyver.py | 4 ++-- qutebrowser/qt/sip.py | 4 ++-- qutebrowser/utils/qtlog.py | 13 ------------- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py index 7db169097..05e560111 100644 --- a/qutebrowser/keyinput/modeparsers.py +++ b/qutebrowser/keyinput/modeparsers.py @@ -254,7 +254,7 @@ class RegisterKeyParser(CommandKeyParser): mode: usertypes.KeyMode, commandrunner: 'runners.CommandRunner', parent: QObject = None) -> None: - super().__init__(mode=usertypes.KeyMode.register, # type: ignore[arg-type] + super().__init__(mode=usertypes.KeyMode.register, win_id=win_id, commandrunner=commandrunner, parent=parent, diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py index d2daa41a7..596a7803a 100644 --- a/qutebrowser/misc/checkpyver.py +++ b/qutebrowser/misc/checkpyver.py @@ -15,8 +15,8 @@ try: except ImportError: # pragma: no cover try: # Python2 - from Tkinter import Tk # type: ignore[import, no-redef] - import tkMessageBox as messagebox # type: ignore[import, no-redef] # noqa: N813 + from Tkinter import Tk # type: ignore[import-not-found, no-redef] + import tkMessageBox as messagebox # type: ignore[import-not-found, no-redef] # noqa: N813 except ImportError: # Some Python without Tk Tk = None # type: ignore[misc, assignment] diff --git a/qutebrowser/qt/sip.py b/qutebrowser/qt/sip.py index ab5d9b907..1eb21bc27 100644 --- a/qutebrowser/qt/sip.py +++ b/qutebrowser/qt/sip.py @@ -23,7 +23,7 @@ elif machinery.USE_PYQT5: try: from PyQt5.sip import * except ImportError: - from sip import * # type: ignore[import] + from sip import * # type: ignore[import-not-found] elif machinery.USE_PYQT6: try: from PyQt6.sip import * @@ -31,6 +31,6 @@ elif machinery.USE_PYQT6: # While upstream recommends using PyQt5.sip ever since PyQt5 5.11, some # distributions still package later versions of PyQt5 with a top-level # "sip" rather than "PyQt5.sip". - from sip import * # type: ignore[import] + from sip import * # type: ignore[import-not-found] else: raise machinery.UnknownWrapper() diff --git a/qutebrowser/utils/qtlog.py b/qutebrowser/utils/qtlog.py index 6ec04e559..3c2ab7cc6 100644 --- a/qutebrowser/utils/qtlog.py +++ b/qutebrowser/utils/qtlog.py @@ -34,19 +34,6 @@ def shutdown_log() -> None: def disable_qt_msghandler() -> Iterator[None]: """Contextmanager which temporarily disables the Qt message handler.""" old_handler = qtcore.qInstallMessageHandler(None) - if machinery.IS_QT6: - # cast str to Optional[str] to be compatible with PyQt6 type hints for - # qInstallMessageHandler - old_handler = cast( - Optional[ - Callable[ - [qtcore.QtMsgType, qtcore.QMessageLogContext, Optional[str]], - None - ] - ], - old_handler, - ) - try: yield finally: -- cgit v1.2.3-54-g00ecf From 513fc2c32987f8712467d7d393101ec09bf97a47 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 16 Oct 2023 21:24:59 +0200 Subject: Adjust diff_cover changelog name --- scripts/dev/changelog_urls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json index a03f66c59..cb1c7d1bb 100644 --- a/scripts/dev/changelog_urls.json +++ b/scripts/dev/changelog_urls.json @@ -119,7 +119,7 @@ "idna": "https://github.com/kjd/idna/blob/master/HISTORY.rst", "tldextract": "https://github.com/john-kurkowski/tldextract/blob/master/CHANGELOG.md", "typing_extensions": "https://github.com/python/typing_extensions/blob/main/CHANGELOG.md", - "diff-cover": "https://github.com/Bachmann1234/diff_cover/blob/main/CHANGELOG", + "diff_cover": "https://github.com/Bachmann1234/diff_cover/blob/main/CHANGELOG", "beautifulsoup4": "https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/CHANGELOG", "check-manifest": "https://github.com/mgedmin/check-manifest/blob/master/CHANGES.rst", "yamllint": "https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst", -- cgit v1.2.3-54-g00ecf From 4c6b34ea0571e1b24f28b08b881405a4073a63eb Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 17 Oct 2023 09:25:53 +0200 Subject: mypy fixup --- qutebrowser/utils/qtlog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/utils/qtlog.py b/qutebrowser/utils/qtlog.py index 3c2ab7cc6..1de9181cf 100644 --- a/qutebrowser/utils/qtlog.py +++ b/qutebrowser/utils/qtlog.py @@ -10,9 +10,9 @@ import faulthandler import logging import sys import traceback -from typing import Iterator, Optional, Callable, cast +from typing import Iterator, Optional -from qutebrowser.qt import core as qtcore, machinery +from qutebrowser.qt import core as qtcore from qutebrowser.utils import log _args = None -- cgit v1.2.3-54-g00ecf From a8355674dac6ac1fc19f5ce618696cf7673b0e8a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 17 Oct 2023 09:33:06 +0200 Subject: log: Ignore deprecation warning from new SIP See https://riverbankcomputing.com/news/SIP_v6.7.12_Released --- qutebrowser/utils/log.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index f912ebd11..3e3b407b0 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -209,6 +209,16 @@ def _init_py_warnings() -> None: message=r"Using or importing the ABCs from " r"'collections' instead of from 'collections.abc' " r"is deprecated.*") + # PyQt 5.15/6.2/6.3/6.4: + # https://riverbankcomputing.com/news/SIP_v6.7.12_Released + warnings.filterwarnings( + 'ignore', + category=DeprecationWarning, + message=( + r"sipPyTypeDict\(\) is deprecated, the extension module should use " + r"sipPyTypeDictRef\(\) instead" + ) + ) @contextlib.contextmanager -- cgit v1.2.3-54-g00ecf From 1b7e3cdb7d0e1861393a10c56999c09964bf5a59 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 17 Oct 2023 09:46:16 +0200 Subject: scripts: Add more debugging info --- scripts/link_pyqt.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py index c188660a6..cbfb7995c 100644 --- a/scripts/link_pyqt.py +++ b/scripts/link_pyqt.py @@ -107,8 +107,11 @@ def get_lib_path(executable, name, required=True): return data elif prefix == 'ImportError': if required: - raise Error("Could not import {} with {}: {}!".format( - name, executable, data)) + wrapper = os.environ["QUTE_QT_WRAPPER"] + raise Error( + f"Could not import {name} with {executable}: {data} " + f"(QUTE_QT_WRAPPER: {wrapper}" + ) return None else: raise ValueError("Unexpected output: {!r}".format(output)) -- cgit v1.2.3-54-g00ecf From 4fd5af3ab3fbca372f103099d4b45451b9cc945c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 17 Oct 2023 09:46:44 +0200 Subject: scripts: Fix typo --- scripts/link_pyqt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py index cbfb7995c..108696317 100644 --- a/scripts/link_pyqt.py +++ b/scripts/link_pyqt.py @@ -110,7 +110,7 @@ def get_lib_path(executable, name, required=True): wrapper = os.environ["QUTE_QT_WRAPPER"] raise Error( f"Could not import {name} with {executable}: {data} " - f"(QUTE_QT_WRAPPER: {wrapper}" + f"(QUTE_QT_WRAPPER: {wrapper})" ) return None else: -- cgit v1.2.3-54-g00ecf