summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2024-04-29 10:56:34 +1200
committerGitHub <noreply@github.com>2024-04-29 10:56:34 +1200
commiteb65fb1a7d342538e2e268d9052bab4583ff6e69 (patch)
tree6f08b993fc1a432fa761c2d1d3f92d1d1167c5b4
parent92decf1c42b6f06fb51766d8b4614bc50bccc813 (diff)
parentbdbbb93cd2120d8d58108da2b5fe72d65bff19f7 (diff)
downloadqutebrowser-eb65fb1a7d342538e2e268d9052bab4583ff6e69.tar.gz
qutebrowser-eb65fb1a7d342538e2e268d9052bab4583ff6e69.zip
Merge pull request #8173 from qutebrowser/update-dependencies
Update dependencies
-rw-r--r--misc/requirements/requirements-dev.txt6
-rw-r--r--misc/requirements/requirements-flake8.txt2
-rw-r--r--misc/requirements/requirements-mypy.txt6
-rw-r--r--misc/requirements/requirements-pyinstaller.txt2
-rw-r--r--misc/requirements/requirements-pylint.txt2
-rw-r--r--misc/requirements/requirements-pyqt-6.txt8
-rw-r--r--misc/requirements/requirements-pyqt.txt8
-rw-r--r--misc/requirements/requirements-tests.txt6
-rw-r--r--misc/requirements/requirements-tox.txt6
-rw-r--r--qutebrowser/utils/qtutils.py17
-rw-r--r--tests/end2end/fixtures/webserver.py2
11 files changed, 33 insertions, 32 deletions
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 5887cbf83..ceffc05fb 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -1,6 +1,6 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-backports.tarfile==1.1.0
+backports.tarfile==1.1.1
build==1.2.1
bump2version==1.0.1
certifi==2024.2.2
@@ -17,7 +17,7 @@ jaraco.classes==3.4.0
jaraco.context==5.3.0
jaraco.functools==4.0.1
jeepney==0.8.0
-keyring==25.1.0
+keyring==25.2.0
manhole==1.8.0
markdown-it-py==3.0.0
mdurl==0.1.2
@@ -30,7 +30,7 @@ Pygments==2.17.2
PyJWT==2.8.0
Pympler==1.0.1
pyproject_hooks==1.0.0
-PyQt-builder==1.16.1
+PyQt-builder==1.16.2
python-dateutil==2.9.0.post0
readme_renderer==43.0
requests==2.31.0
diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 1cb8e2690..a560af530 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -2,7 +2,7 @@
attrs==23.2.0
flake8==7.0.0
-flake8-bugbear==24.4.21
+flake8-bugbear==24.4.26
flake8-builtins==2.5.0
flake8-comprehensions==3.14.0
flake8-debugger==4.1.2
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index 104f7d65e..fcea79aca 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -6,16 +6,16 @@ importlib_resources==6.4.0
Jinja2==3.1.3
lxml==5.2.1
MarkupSafe==2.1.5
-mypy==1.9.0
+mypy==1.10.0
mypy-extensions==1.0.0
pluggy==1.5.0
Pygments==2.17.2
PyQt5-stubs==5.15.6.0
tomli==2.0.1
types-colorama==0.4.15.20240311
-types-docutils==0.20.0.20240406
+types-docutils==0.21.0.20240423
types-Pygments==2.17.0.20240310
types-PyYAML==6.0.12.20240311
-types-setuptools==69.5.0.20240415
+types-setuptools==69.5.0.20240423
typing_extensions==4.11.0
zipp==3.18.1
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index 6c4b1d43b..8435786a5 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -4,5 +4,5 @@ altgraph==0.17.4
importlib_metadata==7.1.0
packaging==24.0
pyinstaller==6.6.0
-pyinstaller-hooks-contrib==2024.4
+pyinstaller-hooks-contrib==2024.5
zipp==3.18.1
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 94aac82a0..192ba4c97 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -11,7 +11,7 @@ idna==3.7
isort==5.13.2
mccabe==0.7.0
pefile==2023.2.7
-platformdirs==4.2.0
+platformdirs==4.2.1
pycparser==2.22
PyJWT==2.8.0
pylint==3.1.0
diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt
index 02f1a325f..b33f919ee 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.6.1
-PyQt6-Qt6==6.6.3
+PyQt6==6.7.0
+PyQt6-Qt6==6.7.0
PyQt6-sip==13.6.0
-PyQt6-WebEngine==6.6.0
-PyQt6-WebEngine-Qt6==6.6.3
+PyQt6-WebEngine==6.7.0
+PyQt6-WebEngine-Qt6==6.7.0
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 02f1a325f..b33f919ee 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.6.1
-PyQt6-Qt6==6.6.3
+PyQt6==6.7.0
+PyQt6-Qt6==6.7.0
PyQt6-sip==13.6.0
-PyQt6-WebEngine==6.6.0
-PyQt6-WebEngine-Qt6==6.6.3
+PyQt6-WebEngine==6.7.0
+PyQt6-WebEngine-Qt6==6.7.0
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 6c086afe9..6d4cffa03 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -5,9 +5,9 @@ beautifulsoup4==4.12.3
blinker==1.7.0
certifi==2024.2.2
charset-normalizer==3.3.2
-cheroot==10.0.0
+cheroot==10.0.1
click==8.1.7
-coverage==7.4.4
+coverage==7.5.0
exceptiongroup==1.2.1
execnet==2.1.1
filelock==3.13.4
@@ -30,7 +30,7 @@ parse-type==0.6.2
pluggy==1.5.0
py-cpuinfo==9.0.0
Pygments==2.17.2
-pytest==8.1.1
+pytest==8.1.2
pytest-bdd==7.1.2
pytest-benchmark==4.0.0
pytest-cov==5.0.0
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 5b0a19159..975774969 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -7,11 +7,11 @@ distlib==0.3.8
filelock==3.13.4
packaging==24.0
pip==24.0
-platformdirs==4.2.0
+platformdirs==4.2.1
pluggy==1.5.0
pyproject-api==1.6.1
setuptools==69.5.1
tomli==2.0.1
-tox==4.14.2
-virtualenv==20.25.3
+tox==4.15.0
+virtualenv==20.26.0
wheel==0.43.0
diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index 21f3b8478..c1f05b78d 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -193,14 +193,15 @@ def check_qdatastream(stream: QDataStream) -> None:
QDataStream.Status.WriteFailed: ("The data stream cannot write to the "
"underlying device."),
}
- try:
- status_to_str[QDataStream.Status.SizeLimitExceeded] = ( # type: ignore[attr-defined]
- "The data stream cannot read or write the data because its size is larger "
- "than supported by the current platform."
- )
- except AttributeError:
- # Added in Qt 6.7
- pass
+ if machinery.IS_QT6:
+ try:
+ status_to_str[QDataStream.Status.SizeLimitExceeded] = (
+ "The data stream cannot read or write the data because its size is larger "
+ "than supported by the current platform."
+ )
+ except AttributeError:
+ # Added in Qt 6.7
+ pass
if stream.status() != QDataStream.Status.Ok:
raise OSError(status_to_str[stream.status()])
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 924cb520b..b70401745 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -116,7 +116,7 @@ def is_ignored_webserver_message(line: str) -> bool:
return testutils.pattern_match(
pattern=(
"Client ('127.0.0.1', *) lost — peer dropped the TLS connection suddenly, "
- "during handshake: (1, '[SSL: SSLV3_ALERT_CERTIFICATE_UNKNOWN] ssl/tls "
+ "during handshake: (1, '[SSL: SSLV3_ALERT_CERTIFICATE_UNKNOWN] * "
"alert certificate unknown (_ssl.c:*)')"
),
value=line,