Merging upstream version 2.2.1~dev0+20250824.

Signed-off-by: Daniel Baumann <daniel@debian.org>

3 files changed, 30 insertions, 18 deletions

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 959b654..297d809 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -20,6 +20,7 @@ on:
 jobs:
   windows_package:
     runs-on: windows-2022
+    timeout-minutes: 30
     if: (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'package'))
     strategy:
       matrix:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d648ba1..2d17d64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,12 +10,17 @@ on:
       core-dump:
         description: "Set to 1 to enable retrieving core dump from crashes"
         default: "0"
+
+env:
+  UV_SYSTEM_PYTHON: 1
+
 jobs:
   test-linux:
     runs-on: ubuntu-22.04
+    timeout-minutes: 10
     strategy:
       matrix:
-        python-version: ["3.7", "3.10"]
+        python-version: ["3.9", "3.13"]
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -27,8 +32,11 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: "pip"
-          cache-dependency-path: "requirements*.txt"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
 
       - name: Sets env var for security
         if: (github.event_name == 'pull_request' && contains(github.event.pull_request.body, 'security_test')) || (github.event_name == 'push' && contains(github.event.head_commit.message, 'security_test'))
@@ -36,9 +44,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
-          pip install -r requirements-ci.txt
-          pip install -e .
+          uv pip install -r requirements-ci.txt
+          uv pip install -e .
 
       - name: Install security dependencies
         if: contains(env.SECURITY_TESTS, 'True')
@@ -72,9 +79,10 @@ jobs:
 
   test-windows:
     runs-on: windows-2022
+    timeout-minutes: 10
     strategy:
       matrix:
-        python-version: ["3.7", "3.10"]
+        python-version: ["3.9", "3.12"]
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -86,14 +94,16 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: "pip"
-          cache-dependency-path: "requirements*.txt"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
-          pip install -r requirements-ci.txt
-          pip install -e .
+          uv pip install -r requirements-ci.txt
+          uv pip install -e .
 
       - name: Test with pytest
         run: |
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a23e264..a5f55eb 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -25,14 +25,15 @@ jobs:
           cache: "pip"
           cache-dependency-path: "requirements*.txt"
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+
       - name: Install dependencies
-        run: |
-          pip install --upgrade pip wheel
-          pip install tox
-          sudo apt-get install enchant-2
+        run: sudo apt-get install enchant-2
 
       - name: Build docs with tox
         env:
           TOX_ENV: docs
-        run: |
-          tox -e $TOX_ENV
+        run: uvx tox -e $TOX_ENV