Merge branch 'main' into pr/7992

This is just to get the CI to re-trigger. Apparently the checkout action doesn't actually checkout the branch being proposed for merge but checks out an actual merge commit. So if you push a PR while main is broken it'll say changes from main are on your branch. That's a little unexpected. main is fixed now and I tried re-running the CI jobs from the web UI but they are still failing with the same errors. Hence this merge of main just to get a change on the branch. I could have gone and found a typo to fix instead. I know I've left enough of them around. ref: actions/checkout#881
daerich · Dec 2, 2023 · 23a1689 · 23a1689
2 parents 7d5acb6 + 75c78ca
commit 23a1689
Show file tree

Hide file tree

Showing 41 changed files with 1,095 additions and 222 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -157,28 +157,28 @@ jobs:
           - testenv: py310-pyqt65
             os: ubuntu-22.04
             python: "3.10"
-          ### PyQt 6.5 (Python 3.11)
-          - testenv: py311-pyqt65
+          ### PyQt 6.6 (Python 3.11)
+          - testenv: py311-pyqt66
             os: ubuntu-22.04
             python: "3.11"
-          ### PyQt 6.5 (Python 3.12)
-          - testenv: py312-pyqt65
+          ### PyQt 6.6 (Python 3.12)
+          - testenv: py312-pyqt66
             os: ubuntu-22.04
-            python: "3.12-dev"
-          ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env)
-          - testenv: py39-pyqt515
+            python: "3.12"
+          ### macOS Big Sur
+          - testenv: py311-pyqt66
             os: macos-11
-            python: "3.9"
+            python: "3.11"
             args: "tests/unit"  # Only run unit tests on macOS
           ### macOS Monterey
-          - testenv: py39-pyqt515
+          - testenv: py311-pyqt66
             os: macos-12
-            python: "3.9"
+            python: "3.11"
             args: "tests/unit"  # Only run unit tests on macOS
-          ### Windows: PyQt 5.15 (Python 3.9 to match PyInstaller env)
-          - testenv: py39-pyqt515
+          ### Windows
+          - testenv: py311-pyqt66
             os: windows-2019
-            python: "3.9"
+            python: "3.11"
     runs-on: "${{ matrix.os }}"
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -15,24 +15,19 @@ jobs:
       matrix:
         include:
           - os: macos-11
-            branch: main
             toxenv: build-release-qt5
             name: qt5-macos
           - os: windows-2019
-            branch: main
             toxenv: build-release-qt5
             name: qt5-windows
           - os: macos-11
             args: --debug
-            branch: main
             toxenv: build-release-qt5
             name: qt5-macos-debug
           - os: windows-2019
             args: --debug
-            branch: main
             toxenv: build-release-qt5
             name: qt5-windows-debug
-
           - os: macos-11
             toxenv: build-release
             name: macos
@@ -52,7 +47,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ matrix.branch }}"
           persist-credentials: false
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
       contents: write  # To push release commit/tag
     steps:
       - name: Find release branch
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         id: find-branch
         with:
           script: |
@@ -84,7 +84,7 @@ jobs:
         id: bump
         run: "tox -e update-version -- ${{ github.event.inputs.release_type }}"
       - name: Check milestone
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const milestones = await github.paginate(github.rest.issues.listMilestones, {
@@ -178,7 +178,7 @@ jobs:
       contents: write  # To change release
     steps:
       - name: Publish final release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             await github.rest.repos.updateRelease({

diff --git a/README.asciidoc b/README.asciidoc
@@ -227,7 +227,7 @@ Active
   https://tridactyl.xyz/[Tridactyl],
   https://addons.mozilla.org/en-GB/firefox/addon/vimium-ff/[Vimium-FF]
 * Addons for Firefox and Chrome:
-  https://github.com/brookhong/Surfingkeys[Surfingkeys],
+  https://github.com/brookhong/Surfingkeys[Surfingkeys] (https://github.com/brookhong/Surfingkeys/issues/1796[somewhat sketchy]...),
   https://lydell.github.io/LinkHints/[Link Hints] (hinting only),
   https://github.com/ueokande/vimmatic[Vimmatic]
 

diff --git a/doc/backers.asciidoc b/doc/backers.asciidoc
@@ -1,6 +1,14 @@
 Crowdfunding backers
 ====================
 
+2019+
+-----
+
+Since late 2019, qutebrowser is taking recurring donations via
+https://github.com/sponsors/The-Compiler/[GitHub Sponsors] and
+https://liberapay.com/The-Compiler/[Liberapay]. You can find Sponsors/Patrons
+who opted to be listed as public on the respective pages. **Thank you!**
+
 2017
 ----
 

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
@@ -15,6 +15,25 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+[[v3.1.0]]
+v3.1.0 (unreleased)
+-------------------
+
+Changed
+~~~~~~~
+
+- (TODO) Upgraded the bundled Qt version to 6.6.1, based on Chromium 112. Note
+  this is only relevant for the macOS/Windows releases, on Linux those will be
+  upgraded via your distribution packages.
+
+Fixed
+~~~~~
+
+- (TODO) Compatibility with PDF.js v4
+- Added an elaborate workaround for a bug in QtWebEngine 6.6.0 causing crashes
+  on Google Mail/Meet/Chat.
+
+
 [[v3.0.2]]
 v3.0.2 (2023-10-19)
 -------------------

diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
@@ -2,19 +2,19 @@
 
 build==1.0.3
 bump2version==1.0.1
-certifi==2023.7.22
+certifi==2023.11.17
 cffi==1.16.0
-charset-normalizer==3.3.1
+charset-normalizer==3.3.2
 cryptography==41.0.5
 docutils==0.20.1
 github3.py==4.0.1
 hunter==3.6.1
-idna==3.4
+idna==3.6
 importlib-metadata==6.8.0
-importlib-resources==6.1.0
+importlib-resources==6.1.1
 jaraco.classes==3.3.0
 jeepney==0.8.0
-keyring==24.2.0
+keyring==24.3.0
 manhole==1.8.0
 markdown-it-py==3.0.0
 mdurl==0.1.2
@@ -24,7 +24,7 @@ packaging==23.2
 pkginfo==1.9.6
 ply==3.11
 pycparser==2.21
-Pygments==2.16.1
+Pygments==2.17.2
 PyJWT==2.8.0
 Pympler==1.0.1
 pyproject_hooks==1.0.0
@@ -34,13 +34,13 @@ readme-renderer==42.0
 requests==2.31.0
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
-rich==13.6.0
+rich==13.7.0
 SecretStorage==3.3.3
 sip==6.7.12
 six==1.16.0
 tomli==2.0.1
 twine==4.0.2
 typing_extensions==4.8.0
 uritemplate==4.1.1
-# urllib3==2.0.7
+# urllib3==2.1.0
 zipp==3.17.0
diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
@@ -2,11 +2,11 @@
 
 attrs==23.1.0
 flake8==6.1.0
-flake8-bugbear==23.9.16
-flake8-builtins==2.1.0
+flake8-bugbear==23.11.26
+flake8-builtins==2.2.0
 flake8-comprehensions==3.14.0
 flake8-debugger==4.1.2
-flake8-deprecated==2.1.0
+flake8-deprecated==2.2.1
 flake8-docstrings==1.7.0
 flake8-future-import==0.4.7
 flake8-plugin-utils==1.3.3

diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
@@ -1,21 +1,21 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 chardet==5.2.0
-diff_cover==8.0.0
-importlib-resources==6.1.0
+diff_cover==8.0.1
+importlib-resources==6.1.1
 Jinja2==3.1.2
 lxml==4.9.3
 MarkupSafe==2.1.3
-mypy==1.6.1
+mypy==1.7.1
 mypy-extensions==1.0.0
 pluggy==1.3.0
-Pygments==2.16.1
+Pygments==2.17.2
 PyQt5-stubs==5.15.6.0
 tomli==2.0.1
 types-colorama==0.4.15.12
 types-docutils==0.20.0.3
-types-Pygments==2.16.0.0
+types-Pygments==2.17.0.0
 types-PyYAML==6.0.12.12
-types-setuptools==68.2.0.0
+types-setuptools==68.2.0.2
 typing_extensions==4.8.0
 zipp==3.17.0
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
@@ -3,6 +3,6 @@
 altgraph==0.17.4
 importlib-metadata==6.8.0
 packaging==23.2
-pyinstaller==6.1.0
+pyinstaller==6.2.0
 pyinstaller-hooks-contrib==2023.10
 zipp==3.17.0
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
@@ -1,17 +1,17 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 astroid==3.0.1
-certifi==2023.7.22
+certifi==2023.11.17
 cffi==1.16.0
-charset-normalizer==3.3.1
+charset-normalizer==3.3.2
 cryptography==41.0.5
 dill==0.3.7
 github3.py==4.0.1
-idna==3.4
+idna==3.6
 isort==5.12.0
 mccabe==0.7.0
 pefile==2023.2.7
-platformdirs==3.11.0
+platformdirs==4.0.0
 pycparser==2.21
 PyJWT==2.8.0
 pylint==3.0.2
@@ -20,7 +20,7 @@ python-dateutil==2.8.2
 requests==2.31.0
 six==1.16.0
 tomli==2.0.1
-tomlkit==0.12.1
+tomlkit==0.12.3
 typing_extensions==4.8.0
 uritemplate==4.1.1
-# urllib3==2.0.7
+# urllib3==2.1.0
diff --git a/misc/requirements/requirements-pyqt-6.6.txt b/misc/requirements/requirements-pyqt-6.6.txt
@@ -0,0 +1,7 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt6==6.6.0
+PyQt6-Qt6==6.6.0
+PyQt6-sip==13.6.0
+PyQt6-WebEngine==6.6.0
+PyQt6-WebEngine-Qt6==6.6.0
diff --git a/misc/requirements/requirements-pyqt-6.6.txt-raw b/misc/requirements/requirements-pyqt-6.6.txt-raw
@@ -0,0 +1,4 @@
+PyQt6 >= 6.6, < 6.7
+PyQt6-Qt6 >= 6.6, < 6.7
+PyQt6-WebEngine >= 6.6, < 6.7
+PyQt6-WebEngine-Qt6 >= 6.6, < 6.7
diff --git 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.3
-PyQt6-Qt6==6.5.3
+PyQt6==6.6.0
+PyQt6-Qt6==6.6.0
 PyQt6-sip==13.6.0
-PyQt6-WebEngine==6.5.0
-PyQt6-WebEngine-Qt6==6.5.3
+PyQt6-WebEngine==6.6.0
+PyQt6-WebEngine-Qt6==6.6.0
diff --git 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.3
-PyQt6-Qt6==6.5.3
+PyQt6==6.6.0
+PyQt6-Qt6==6.6.0
 PyQt6-sip==13.6.0
-PyQt6-WebEngine==6.5.0
-PyQt6-WebEngine-Qt6==6.5.3
+PyQt6-WebEngine==6.6.0
+PyQt6-WebEngine-Qt6==6.6.0
diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt
@@ -1,17 +1,17 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 build==1.0.3
-certifi==2023.7.22
-charset-normalizer==3.3.1
+certifi==2023.11.17
+charset-normalizer==3.3.2
 docutils==0.20.1
-idna==3.4
+idna==3.6
 importlib-metadata==6.8.0
 packaging==23.2
-Pygments==2.16.1
+Pygments==2.17.2
 pyproject_hooks==1.0.0
 pyroma==4.2
 requests==2.31.0
 tomli==2.0.1
-trove-classifiers==2023.10.18
-urllib3==2.0.7
+trove-classifiers==2023.11.22
+urllib3==2.1.0
 zipp==3.17.0
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
@@ -2,16 +2,16 @@
 
 alabaster==0.7.13
 Babel==2.13.1
-certifi==2023.7.22
-charset-normalizer==3.3.1
+certifi==2023.11.17
+charset-normalizer==3.3.2
 docutils==0.20.1
-idna==3.4
+idna==3.6
 imagesize==1.4.1
 importlib-metadata==6.8.0
 Jinja2==3.1.2
 MarkupSafe==2.1.3
 packaging==23.2
-Pygments==2.16.1
+Pygments==2.17.2
 pytz==2023.3.post1
 requests==2.31.0
 snowballstemmer==2.2.0
@@ -22,5 +22,5 @@ sphinxcontrib-htmlhelp==2.0.1
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
-urllib3==2.0.7
+urllib3==2.1.0
 zipp==3.17.0