Merge remote-tracking branch 'upstream/main' into feat/tree_tabs_inte…

…gration
pinusc · Jan 13, 2024 · 9b5a017 · 9b5a017
2 parents 1d6bea7 + 6bc140b
commit 9b5a017
Show file tree

Hide file tree

Showing 533 changed files with 5,714 additions and 8,715 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.4
+current_version = 3.1.0
 commit = True
 message = Release v{new_version}
 tag = True

diff --git a/.github/CONTRIBUTING.asciidoc b/.github/CONTRIBUTING.asciidoc
@@ -9,7 +9,7 @@ open pull requests.
   pull request page after pushing changes.
 
 - If you are stuck somewhere or have questions,
-  https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/index.asciidoc#getting-help[please ask]!
+  https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/index.asciidoc#getting-help[please ask]!
 
 See the link:../doc/contributing.asciidoc[full contribution documentation] for
 details and other useful hints.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
 github: The-Compiler
-custom: https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating
+custom: https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating
diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml
@@ -12,25 +12,33 @@ jobs:
     if: "github.repository == 'qutebrowser/qutebrowser'"
     runs-on: ubuntu-20.04
     timeout-minutes: 45
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - testenv: bleeding
+            image: "archlinux-webengine-unstable-qt6"
+          - testenv: bleeding-qt5
+            image: "archlinux-webengine-unstable"
     container:
-      image: "qutebrowser/ci:archlinux-webengine-unstable"
+      image: "qutebrowser/ci:${{ matrix.image }}"
       env:
         FORCE_COLOR: "1"
         PY_COLORS: "1"
-        DOCKER: "archlinux-webengine-unstable"
+        DOCKER: "${{ matrix.image }}"
         CI: true
       volumes:
         # Hardcoded because we can't use ${{ runner.temp }} here apparently.
         - /home/runner/work/_temp/:/home/runner/work/_temp/
       options: --privileged --tty
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up problem matchers
         run: "python scripts/dev/ci/problemmatchers.py py3 ${{ runner.temp }}"
       - name: Run tox
-        run: dbus-run-session tox -e bleeding
+        run: dbus-run-session tox -e ${{ matrix.testenv }}
   irc:
     timeout-minutes: 2
     continue-on-error: true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,8 +33,9 @@ jobs:
             args: "-f gcc"  # For problem matchers
           - testenv: yamllint
           - testenv: actionlint
+          - testenv: package
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - uses: actions/cache@v3
@@ -44,10 +45,10 @@ jobs:
             .tox
             ~/.cache/pip
           key: "${{ matrix.testenv }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('scripts/dev/pylint_checkers/qute_pylint/*.py') }}"
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '16.x'
         if: "matrix.testenv == 'eslint'"
@@ -56,7 +57,8 @@ jobs:
       - name: Install dependencies
         run: |
             [[ ${{ matrix.testenv }} == eslint ]] && npm install -g eslint
-            [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get update && sudo apt-get install --no-install-recommends asciidoc
+            [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get update && sudo apt-get install --no-install-recommends asciidoc libegl1-mesa
+            [[ ${{ matrix.testenv }} == vulture || ${{ matrix.testenv }} == pylint ]] && sudo apt-get update && sudo apt-get install --no-install-recommends libegl1-mesa
             if [[ ${{ matrix.testenv }} == shellcheck ]]; then
                 scversion="stable"
                 bindir="$HOME/.local/bin"
@@ -89,17 +91,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - testenv: py
+          - testenv: py-qt5
             image: archlinux-webkit
-          - testenv: py
+          - testenv: py-qt5
             image: archlinux-webengine
-          - testenv: py-qt6
+          - testenv: py-qt5
+            image: archlinux-webengine-unstable
+          - testenv: py
             image: archlinux-webengine-qt6
           - testenv: py
-            image: archlinux-webengine-unstable
-            args: ""
-            # - testenv: py
-            #   image: archlinux-webengine-unstable-qt6  # FIXME:qt6.5 activate
+            image: archlinux-webengine-unstable-qt6
     container:
       image: "qutebrowser/ci:${{ matrix.image }}"
       env:
@@ -111,13 +112,13 @@ jobs:
         - /home/runner/work/_temp/:/home/runner/work/_temp/
       options: --privileged --tty
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up problem matchers
-        run: "python scripts/dev/ci/problemmatchers.py py38 ${{ runner.temp }}"
+        run: "python scripts/dev/ci/problemmatchers.py tests ${{ runner.temp }}"
       - name: Run tox
-        run: "dbus-run-session -- tox -e ${{ matrix.testenv }} -- ${{ matrix.args }}"
+        run: "dbus-run-session -- tox -e ${{ matrix.testenv }}"
 
   tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
@@ -156,31 +157,31 @@ 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
-          #   os: ubuntu-22.04
-          #   python: "3.12-dev"
-          ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env)
-          - testenv: py39-pyqt515
+          ### PyQt 6.6 (Python 3.12)
+          - testenv: py312-pyqt66
+            os: ubuntu-22.04
+            python: "3.12"
+          ### macOS Big Sur
+          - testenv: py312-pyqt66
             os: macos-11
-            python: "3.9"
+            python: "3.12"
             args: "tests/unit"  # Only run unit tests on macOS
           ### macOS Monterey
-          - testenv: py39-pyqt515
+          - testenv: py312-pyqt66
             os: macos-12
-            python: "3.9"
+            python: "3.12"
             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: py312-pyqt66
             os: windows-2019
-            python: "3.9"
+            python: "3.12"
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - uses: actions/cache@v3
@@ -191,7 +192,7 @@ jobs:
             ~/.cache/pip
           key: "${{ matrix.testenv }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}"
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python }}"
       - name: Set up problem matchers
@@ -228,16 +229,16 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: javascript, python
           queries: +security-extended
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
 
   irc:
     timeout-minutes: 2

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,27 +15,28 @@ jobs:
           - archlinux-webkit
           - archlinux-webengine
           - archlinux-webengine-unstable
+          - archlinux-webengine-unstable-qt6
           - archlinux-webengine-qt6
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - run: pip install jinja2
       - name: Generate Dockerfile
         run: python3 generate.py ${{ matrix.image }}
         working-directory: scripts/dev/ci/docker/
-      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
         with:
           username: qutebrowser
           password: ${{ secrets.DOCKER_TOKEN }}
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
           file: scripts/dev/ci/docker/Dockerfile
           context: .
           tags: "qutebrowser/ci:${{ matrix.image }}"
-          push: ${{ github.ref == 'refs/heads/master' }}
+          push: ${{ github.ref == 'refs/heads/main' }}
 
   irc:
     timeout-minutes: 2

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -15,60 +15,41 @@ jobs:
       matrix:
         include:
           - os: macos-11
-            branch: master
-            toxenv: build-release
-            name: macos
+            toxenv: build-release-qt5
+            name: qt5-macos
           - os: windows-2019
-            args: --64bit
-            branch: master
-            toxenv: build-release
-            name: windows-64bit
-          - os: windows-2019
-            args: --32bit
-            branch: master
-            toxenv: build-release
-            name: windows-32bit
-
+            toxenv: build-release-qt5
+            name: qt5-windows
           - os: macos-11
             args: --debug
-            branch: master
-            toxenv: build-release
-            name: macos-debug
+            toxenv: build-release-qt5
+            name: qt5-macos-debug
           - os: windows-2019
-            args: --64bit --debug
-            branch: master
+            args: --debug
+            toxenv: build-release-qt5
+            name: qt5-windows-debug
+          - os: macos-11
             toxenv: build-release
-            name: windows-64bit-debug
+            name: macos
           - os: windows-2019
-            args: --32bit --debug
-            branch: master
             toxenv: build-release
-            name: windows-32bit-debug
-
-          - os: macos-11
-            toxenv: build-release-qt6
-            name: qt6-macos
-          - os: windows-2019
-            args: --64bit
-            toxenv: build-release-qt6
-            name: qt6-windows-64bit
+            name: windows
           - os: macos-11
             args: --debug
-            toxenv: build-release-qt6
-            name: qt6-macos-debug
+            toxenv: build-release
+            name: macos-debug
           - os: windows-2019
-            args: --64bit --debug
-            toxenv: build-release-qt6
-            name: qt6-windows-64bit-debug
+            args: --debug
+            toxenv: build-release
+            name: windows-debug
     runs-on: "${{ matrix.os }}"
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: "${{ matrix.branch }}"
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install dependencies
@@ -88,7 +69,7 @@ jobs:
             echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
         shell: bash
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "qutebrowser-nightly-${{ steps.info.outputs.date }}-${{ steps.info.outputs.sha_short }}-${{ matrix.name }}"
           path: |

diff --git a/.github/workflows/recompile-requirements.yml b/.github/workflows/recompile-requirements.yml
@@ -18,11 +18,11 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Recompile requirements
@@ -31,7 +31,7 @@ jobs:
       - name: Install apt dependencies
         run: |
             sudo apt-get update
-            sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 asciidoc python3-venv xvfb
+            sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 asciidoc python3-venv xvfb
       - name: Install dependencies
         run: |
             python -m pip install -U pip