Skip to content

Commit

Permalink
Merge pull request #8173 from qutebrowser/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
toofar committed Apr 28, 2024
2 parents 92decf1 + bdbbb93 commit eb65fb1
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 32 deletions.
6 changes: 3 additions & 3 deletions misc/requirements/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion misc/requirements/requirements-flake8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions misc/requirements/requirements-mypy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion misc/requirements/requirements-pyinstaller.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion misc/requirements/requirements-pylint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions misc/requirements/requirements-pyqt-6.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions misc/requirements/requirements-pyqt.txt
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions misc/requirements/requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions misc/requirements/requirements-tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 9 additions & 8 deletions qutebrowser/utils/qtutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()])
Expand Down
2 changes: 1 addition & 1 deletion tests/end2end/fixtures/webserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit eb65fb1

Please sign in to comment.