From 52f5147666fa0111d971ac8b239a9b390d846514 Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Mon, 26 Feb 2024 04:20:13 +0000 Subject: Update dependencies --- misc/requirements/requirements-dev.txt | 6 +++--- misc/requirements/requirements-mypy.txt | 6 +++--- misc/requirements/requirements-pylint.txt | 8 ++++---- misc/requirements/requirements-pyroma.txt | 2 +- misc/requirements/requirements-tests.txt | 8 ++++---- misc/requirements/requirements-tox.txt | 4 ++-- requirements.txt | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index 746e2519d..8c1730f21 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -5,13 +5,13 @@ bump2version==1.0.1 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 -cryptography==42.0.3 +cryptography==42.0.5 docutils==0.20.1 github3.py==4.0.1 hunter==3.6.1 idna==3.6 importlib-metadata==7.0.1 -importlib-resources==6.1.1 +importlib_resources==6.1.2 jaraco.classes==3.3.1 jeepney==0.8.0 keyring==24.3.0 @@ -39,7 +39,7 @@ sip==6.8.3 six==1.16.0 tomli==2.0.1 twine==5.0.0 -typing_extensions==4.9.0 +typing_extensions==4.10.0 uritemplate==4.1.1 # urllib3==2.2.1 zipp==3.17.0 diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index 570788ffc..53e032b86 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -2,7 +2,7 @@ chardet==5.2.0 diff_cover==8.0.3 -importlib-resources==6.1.1 +importlib_resources==6.1.2 Jinja2==3.1.3 lxml==5.1.0 MarkupSafe==2.1.5 @@ -16,6 +16,6 @@ types-colorama==0.4.15.20240205 types-docutils==0.20.0.20240201 types-Pygments==2.17.0.20240106 types-PyYAML==6.0.12.12 -types-setuptools==69.1.0.20240217 -typing_extensions==4.9.0 +types-setuptools==69.1.0.20240223 +typing_extensions==4.10.0 zipp==3.17.0 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index d3689a449..d596cc5c2 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -1,10 +1,10 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -astroid==3.0.3 +astroid==3.1.0 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 -cryptography==42.0.3 +cryptography==42.0.5 dill==0.3.8 github3.py==4.0.1 idna==3.6 @@ -14,13 +14,13 @@ pefile==2023.2.7 platformdirs==4.2.0 pycparser==2.21 PyJWT==2.8.0 -pylint==3.0.3 +pylint==3.1.0 python-dateutil==2.8.2 ./scripts/dev/pylint_checkers requests==2.31.0 six==1.16.0 tomli==2.0.1 tomlkit==0.12.3 -typing_extensions==4.9.0 +typing_extensions==4.10.0 uritemplate==4.1.1 # urllib3==2.2.1 diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt index 592bfe4fa..2a6cdeb93 100644 --- a/misc/requirements/requirements-pyroma.txt +++ b/misc/requirements/requirements-pyroma.txt @@ -12,6 +12,6 @@ pyproject_hooks==1.0.0 pyroma==4.2 requests==2.31.0 tomli==2.0.1 -trove-classifiers==2024.1.31 +trove-classifiers==2024.2.23 urllib3==2.2.1 zipp==3.17.0 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 0fa0f33e8..c8fe157a4 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -7,13 +7,13 @@ certifi==2024.2.2 charset-normalizer==3.3.2 cheroot==10.0.0 click==8.1.7 -coverage==7.4.1 +coverage==7.4.3 exceptiongroup==1.2.0 execnet==2.0.2 filelock==3.13.1 Flask==3.0.2 hunter==3.6.1 -hypothesis==6.98.8 +hypothesis==6.98.12 idna==3.6 importlib-metadata==7.0.1 iniconfig==2.0.0 @@ -30,7 +30,7 @@ parse-type==0.6.2 pluggy==1.4.0 py-cpuinfo==9.0.0 Pygments==2.17.2 -pytest==8.0.1 +pytest==8.0.2 pytest-bdd==7.0.1 pytest-benchmark==4.0.0 pytest-cov==4.1.0 @@ -49,7 +49,7 @@ sortedcontainers==2.4.0 soupsieve==2.5 tldextract==5.1.1 tomli==2.0.1 -typing_extensions==4.9.0 +typing_extensions==4.10.0 urllib3==2.2.1 vulture==2.11 Werkzeug==3.0.1 diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index fde6675dd..3c27d668f 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -10,8 +10,8 @@ pip==24.0 platformdirs==4.2.0 pluggy==1.4.0 pyproject-api==1.6.1 -setuptools==69.1.0 +setuptools==69.1.1 tomli==2.0.1 tox==4.13.0 -virtualenv==20.25.0 +virtualenv==20.25.1 wheel==0.42.0 diff --git a/requirements.txt b/requirements.txt index 95fe6e80a..87f000da6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ adblock==0.6.0 colorama==0.4.6 -importlib-resources==6.1.1 ; python_version=="3.8.*" +importlib_resources==6.1.2 Jinja2==3.1.3 MarkupSafe==2.1.5 Pygments==2.17.2 -- cgit v1.2.3-54-g00ecf From 2f3d0161f3b4c2aabbf3f970f8ec25fbac7f7b4d Mon Sep 17 00:00:00 2001 From: toofar Date: Mon, 26 Feb 2024 19:22:27 +1300 Subject: Update lint etc for dependencies The lint ones are: linters (pylint): qutebrowser/completion/completionwidget.py#L440 Consider using 'height = min(height, contents_height)' instead of unnecessary if block linters (pylint): qutebrowser/browser/webengine/webview.py#L241 Useless suppression of 'no-member' The no-member one might be due to this change: https://github.com/pylint-dev/pylint/issues/9246 For the importlib-resources one, I'm not sure why it's changed to be underscore instead of a dash now. But at least it's consistent across all the requirements files now! I feel like I've seem this in a previous dependancy update too (for a different package?) but I can't find that now. --- misc/requirements/requirements-qutebrowser.txt-raw | 4 ++-- qutebrowser/browser/webengine/webview.py | 4 +--- qutebrowser/completion/completionwidget.py | 3 +-- scripts/dev/changelog_urls.json | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw index bd33e26e4..ca4081d1d 100644 --- a/misc/requirements/requirements-qutebrowser.txt-raw +++ b/misc/requirements/requirements-qutebrowser.txt-raw @@ -13,11 +13,11 @@ PyYAML #@ add: pyobjc-framework-Cocoa ; sys_platform=="darwin" ## stdlib backports -importlib-resources +importlib_resources ## Optional dependencies Pygments # For :view-source --pygments or on QtWebKit colorama # Colored log output on Windows adblock # Improved adblocking -#@ markers: importlib-resources python_version=="3.8.*" +#@ markers: importlib_resources python_version=="3.8.*" diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index a6f2ae113..96c0c97e5 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -238,9 +238,7 @@ class WebEnginePage(QWebEnginePage): self._set_bg_color() config.instance.changed.connect(self._set_bg_color) if machinery.IS_QT6: - self.certificateError.connect( # pylint: disable=no-member - self._handle_certificate_error - ) + self.certificateError.connect(self._handle_certificate_error) # Qt 5: Overridden method instead of signal @config.change_filter('colors.webpage.bg') diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py index f042be0a1..0f5dc0de9 100644 --- a/qutebrowser/completion/completionwidget.py +++ b/qutebrowser/completion/completionwidget.py @@ -437,8 +437,7 @@ class CompletionView(QTreeView): contents_height = ( self.viewportSizeHint().height() + bar.sizeHint().height()) - if contents_height <= height: - height = contents_height + height = min(height, contents_height) # The width isn't really relevant as we're expanding anyways. return QSize(-1, height) diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json index a2f0b7612..e3644f417 100644 --- a/scripts/dev/changelog_urls.json +++ b/scripts/dev/changelog_urls.json @@ -133,7 +133,7 @@ "mypy-extensions": "https://github.com/python/mypy_extensions/commits/master", "pyroma": "https://github.com/regebro/pyroma/blob/master/CHANGES.txt", "adblock": "https://github.com/ArniDagur/python-adblock/blob/master/CHANGELOG.md", - "importlib-resources": "https://importlib-resources.readthedocs.io/en/latest/history.html", + "importlib_resources": "https://importlib-resources.readthedocs.io/en/latest/history.html", "importlib-metadata": "https://github.com/python/importlib_metadata/blob/main/NEWS.rst", "zipp": "https://github.com/jaraco/zipp/blob/main/NEWS.rst", "pip": "https://pip.pypa.io/en/stable/news/", -- cgit v1.2.3-54-g00ecf