From 6f12dabfa5cf7cab98e48e520d324a03dd58ecdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Erjavec?= <ales.erjavec@fri.uni-lj.si>
Date: Fri, 16 Oct 2026 12:05:41 +0200
Subject: [PATCH 1/2] ci: Add Python 3.15 to test matrix

---
 .github/workflows/run-tests-workflow.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/run-tests-workflow.yml b/.github/workflows/run-tests-workflow.yml
index 8ee551c01..5801648af 100644
--- a/.github/workflows/run-tests-workflow.yml
+++ b/.github/workflows/run-tests-workflow.yml
@@ -54,6 +54,10 @@ jobs:
             python-version: "3.14"
             test-env: "PyQt6~=6.11.0 PyQt6-Qt6~=6.11.0 PyQt6-WebEngine~=6.11.0 PyQt6-WebEngine-Qt6~=6.11.0"
 
+          - os: ubuntu-latest
+            python-version: "3.15"
+            test-env: "PyQt6~=6.11.0 PyQt6-Qt6~=6.11.0 PyQt6-WebEngine~=6.11.0 PyQt6-WebEngine-Qt6~=6.11.0"
+
           # macOS
           - os: macos-14
             python-version: "3.10"
@@ -75,6 +79,10 @@ jobs:
             python-version: "3.14"
             test-env: "PyQt6~=6.11.0 PyQt6-Qt6~=6.11.0 PyQt6-WebEngine~=6.11.0 PyQt6-WebEngine-Qt6~=6.11.0"
 
+          - os: macos-latest
+            python-version: "3.15"
+            test-env: "PyQt6~=6.11.0 PyQt6-Qt6~=6.11.0 PyQt6-WebEngine~=6.11.0 PyQt6-WebEngine-Qt6~=6.11.0"
+
           # Windows
           - os: windows-2022
             python-version: "3.10"
@@ -100,6 +108,10 @@ jobs:
             python-version: "3.14"
             test-env: "PyQt6~=6.11.0 PyQt6-Qt6~=6.11.0 PyQt6-WebEngine~=6.11.0 PyQt6-WebEngine-Qt6~=6.11.0"
 
+          - os: windows-latest
+            python-version: "3.15"
+            test-env: "PyQt6~=6.11.0 PyQt6-Qt6~=6.11.0 PyQt6-WebEngine~=6.11.0 PyQt6-WebEngine-Qt6~=6.11.0"
+
     steps:
       - uses: actions/checkout@v6
       - name: Setup Python

From 5aa5b47841741b20216791f5a8f6a1da2c142842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Erjavec?= <ales.erjavec@fri.uni-lj.si>
Date: Fri, 16 Oct 2026 12:08:30 +0200
Subject: [PATCH 2/2] ci: Replace custom pip caching with
 actions/setup-python's cache

---
 .github/workflows/run-tests-workflow.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/run-tests-workflow.yml b/.github/workflows/run-tests-workflow.yml
index 5801648af..141db5d6d 100644
--- a/.github/workflows/run-tests-workflow.yml
+++ b/.github/workflows/run-tests-workflow.yml
@@ -9,7 +9,6 @@ jobs:
     env:
       PYTHONFAULTHANDLER: 1
       PIP_NO_PIP_VERSION_CHECK: 1
-      PIP_CACHE_DIR: .pip-cache
       PIP_PREFER_BINARY: 1
       UBUNTU_SYSTEM_PACKAGES: |
         libxkbcommon-x11-0
@@ -115,9 +114,13 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: |
+            setup.*
+            .github/workflows/run-tests-workflow.yml
 
       - name: Install System Deps
         if: ${{ startsWith(runner.os, 'Linux') }}
@@ -128,14 +131,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y $UBUNTU_SYSTEM_PACKAGES $PACKAGES
 
-      - name: Setup Pip Cache
-        uses: actions/cache@v5
-        with:
-          path: .pip-cache
-          key: ${{ runner.os }}-py-${{ matrix.python-version }}-pip-${{ hashFiles('setup.*', '.github/workflows/run-tests-workflow.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-py-${{ matrix.python-version }}-pip
-
       - name: Install Test Deps
         env:
           TEST_ENV: ${{ matrix.test-env }}