Merge branch 'update-dependencies'

14 files changed, 39 insertions, 35 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4a730f12..cd918b99a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,9 +162,9 @@ jobs:
             os: ubuntu-22.04
             python: "3.11"
           ### PyQt 6.5 (Python 3.12)
-          - testenv: py312-pyqt65
-            os: ubuntu-22.04
-            python: "3.12-dev"
+          # - testenv: py312-pyqt65
+          #   os: ubuntu-22.04
+          #   python: "3.12-dev"
           ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env)
           - testenv: py39-pyqt515
             os: macos-11
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 6e212f258..704a5874f 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -28,10 +28,10 @@ Pygments==2.15.1
 PyJWT==2.7.0
 Pympler==1.0.1
 pyproject_hooks==1.0.0
-PyQt-builder==1.15.0
+PyQt-builder==1.15.1
 python-dateutil==2.8.2
 readme-renderer==37.3
-requests==2.30.0
+requests==2.31.0
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
 rich==13.3.5
@@ -40,7 +40,7 @@ sip==6.7.9
 six==1.16.0
 tomli==2.0.1
 twine==4.0.2
-typing_extensions==4.5.0
+typing_extensions==4.6.2
 uritemplate==4.1.1
 # urllib3==2.0.2
 webencodings==0.5.1
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index a4f011e82..7c92951ef 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -13,6 +13,6 @@ pluggy==1.0.0
 Pygments==2.15.1
 PyQt5-stubs==5.15.6.0
 tomli==2.0.1
-types-PyYAML==6.0.12.9
-typing_extensions==4.5.0
+types-PyYAML==6.0.12.10
+typing_extensions==4.6.2
 zipp==3.15.0
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 40455bc1b..6024fcb55 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -18,12 +18,12 @@ PyJWT==2.7.0
 pylint==2.17.4
 python-dateutil==2.8.2
 ./scripts/dev/pylint_checkers
-requests==2.30.0
+requests==2.31.0
 six==1.16.0
 tomli==2.0.1
 tomlkit==0.11.8
 typed-ast==1.5.4 ; python_version<"3.8"
-typing_extensions==4.5.0
+typing_extensions==4.6.2
 uritemplate==4.1.1
 # urllib3==2.0.2
 wrapt==1.15.0
diff --git a/misc/requirements/requirements-pyqt-6.5.txt b/misc/requirements/requirements-pyqt-6.5.txt
index 7d2d9d748..3c0ad3629 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.0
-PyQt6-Qt6==6.5.0
+PyQt6-Qt6==6.5.1
 PyQt6-sip==13.5.1
 PyQt6-WebEngine==6.5.0
-PyQt6-WebEngine-Qt6==6.5.0
+PyQt6-WebEngine-Qt6==6.5.1
diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt
index 7d2d9d748..3c0ad3629 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.0
-PyQt6-Qt6==6.5.0
+PyQt6-Qt6==6.5.1
 PyQt6-sip==13.5.1
 PyQt6-WebEngine==6.5.0
-PyQt6-WebEngine-Qt6==6.5.0
+PyQt6-WebEngine-Qt6==6.5.1
diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt
index 33101edf1..347d0d4e9 100644
--- a/misc/requirements/requirements-pyroma.txt
+++ b/misc/requirements/requirements-pyroma.txt
@@ -9,7 +9,7 @@ packaging==23.1
 Pygments==2.15.1
 pyproject_hooks==1.0.0
 pyroma==4.2
-requests==2.30.0
+requests==2.31.0
 tomli==2.0.1
-trove-classifiers==2023.5.2
+trove-classifiers==2023.5.24
 urllib3==2.0.2
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
index 0114038a5..365210902 100644
--- a/misc/requirements/requirements-sphinx.txt
+++ b/misc/requirements/requirements-sphinx.txt
@@ -13,7 +13,7 @@ MarkupSafe==2.1.2
 packaging==23.1
 Pygments==2.15.1
 pytz==2023.3
-requests==2.30.0
+requests==2.31.0
 snowballstemmer==2.2.0
 Sphinx==7.0.1
 sphinxcontrib-applehelp==1.0.4
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index ba5219878..79221bb8c 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -7,13 +7,13 @@ certifi==2023.5.7
 charset-normalizer==3.1.0
 cheroot==10.0.0
 click==8.1.3
-coverage==7.2.5
+coverage==7.2.6
 exceptiongroup==1.1.1
 execnet==1.9.0
 filelock==3.12.0
 Flask==2.3.2 ; python_version>="3.8"
 hunter==3.6.1
-hypothesis==6.75.3
+hypothesis==6.75.6
 idna==3.4
 importlib-metadata==6.6.0
 iniconfig==2.0.0
@@ -33,7 +33,7 @@ Pygments==2.15.1
 pytest==7.3.1
 pytest-bdd==6.1.1
 pytest-benchmark==4.0.0
-pytest-cov==4.0.0
+pytest-cov==4.1.0
 pytest-instafail==0.5.0
 pytest-mock==3.10.0
 pytest-qt==4.2.0
@@ -42,7 +42,7 @@ pytest-rerunfailures==11.1.2
 pytest-xdist==3.3.1
 pytest-xvfb==2.0.0
 PyVirtualDisplay==3.0
-requests==2.30.0
+requests==2.31.0
 requests-file==1.5.1
 six==1.16.0
 sortedcontainers==2.4.0
@@ -50,7 +50,7 @@ soupsieve==2.4.1
 tldextract==3.4.4
 toml==0.10.2
 tomli==2.0.1
-typing_extensions==4.5.0
+typing_extensions==4.6.2
 urllib3==2.0.2
 vulture==2.7
 Werkzeug==2.3.4 ; python_version>="3.8"
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 3aad8499a..3b218dc9d 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-cachetools==5.3.0
+cachetools==5.3.1
 chardet==5.1.0
 colorama==0.4.6
 distlib==0.3.6
@@ -12,6 +12,6 @@ pluggy==1.0.0
 pyproject_api==1.5.1
 setuptools==67.8.0
 tomli==2.0.1
-tox==4.5.1
+tox==4.5.2
 virtualenv==20.23.0
 wheel==0.40.0
diff --git a/misc/requirements/requirements-yamllint.txt b/misc/requirements/requirements-yamllint.txt
index 935935d6f..718012a4e 100644
--- a/misc/requirements/requirements-yamllint.txt
+++ b/misc/requirements/requirements-yamllint.txt
@@ -2,4 +2,4 @@
 
 pathspec==0.11.1
 PyYAML==6.0
-yamllint==1.31.0
+yamllint==1.32.0
diff --git a/requirements.txt b/requirements.txt
index 86f47fcfb..d21bb9729 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ Jinja2==3.1.2
 MarkupSafe==2.1.2
 Pygments==2.15.1
 PyYAML==6.0
-typing_extensions==4.5.0 ; python_version<"3.8"
+typing_extensions==4.6.2 ; python_version<"3.8"
 zipp==3.15.0
 # Unpinned due to recompile_requirements.py limitations
 pyobjc-core ; sys_platform=="darwin"
diff --git a/tests/unit/browser/webkit/test_cache.py b/tests/unit/browser/webkit/test_cache.py
index 90715ec21..8e43b583f 100644
--- a/tests/unit/browser/webkit/test_cache.py
+++ b/tests/unit/browser/webkit/test_cache.py
@@ -30,10 +30,19 @@ def disk_cache(tmpdir, config_stub):
     return cache.DiskCache(str(tmpdir))
 
 
-def preload_cache(cache, url='http://www.example.com/', content=b'foobar'):
+def build_metadata(url='http://qutebrowser.org/'):
     metadata = QNetworkCacheMetaData()
     metadata.setUrl(QUrl(url))
+    # https://codereview.qt-project.org/c/qt/qtbase/+/465547
+    metadata.setRawHeaders([(b"X-Hello", b"World")])
+
     assert metadata.isValid()
+    assert metadata.rawHeaders()
+    return metadata
+
+
+def preload_cache(cache, url='http://www.example.com/', content=b'foobar'):
+    metadata = build_metadata(url)
     device = cache.prepare(metadata)
     assert device is not None
     device.write(content)
@@ -71,12 +80,8 @@ def test_cache_size_leq_max_cache_size(config_stub, tmpdir):
 
 def test_cache_existing_metadata_file(tmpdir, disk_cache):
     """Test querying existing meta data file from activated cache."""
-    url = 'http://qutebrowser.org'
     content = b'foobar'
-
-    metadata = QNetworkCacheMetaData()
-    metadata.setUrl(QUrl(url))
-    assert metadata.isValid()
+    metadata = build_metadata()
 
     device = disk_cache.prepare(metadata)
     assert device is not None
@@ -173,8 +178,7 @@ def test_cache_full(tmpdir):
     content2 = b'ohmycert'
     preload_cache(disk_cache, url2, content2)
 
-    metadata = QNetworkCacheMetaData()
-    metadata.setUrl(QUrl(url))
+    metadata = build_metadata(url)
     soon = QDateTime.currentDateTime().addMonths(4)
     assert soon.isValid()
     metadata.setLastModified(soon)
diff --git a/tests/unit/misc/test_elf.py b/tests/unit/misc/test_elf.py
index 41a5e273d..36b947a22 100644
--- a/tests/unit/misc/test_elf.py
+++ b/tests/unit/misc/test_elf.py
@@ -60,7 +60,7 @@ def test_result(webengine_versions, qapp, caplog):
     pytest.importorskip('qutebrowser.qt.webenginecore')
 
     versions = elf.parse_webenginecore()
-    if webengine_versions.webengine == utils.VersionNumber(6, 5):
+    if webengine_versions.webengine.strip_patch() == utils.VersionNumber(6, 5):
         assert versions is None
         pytest.xfail("ELF file structure not supported")