From 37e2f2fb7f2d4a9c805aff9b06f264b2a5288aeb Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Fri, 23 May 2025 00:30:52 +0200
Subject: [PATCH 1/3] Simplify tox.ini

---
 tox.ini | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/tox.ini b/tox.ini
index 7d25ac3..985f502 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,19 @@
 [tox]
 isolated_build = True
 envlist =
-    {3.12,3.13}-djmain
-    {3.10,3.11,3.12,3.13,pypy310}-dj{5.0,5.1,5.2}
-    {3.9,3.10,3.11,3.12,3.13,pypy39,pypy310}-dj4.2
-    {3.9,3.10,3.11,3.12,3.13,pypy39,pypy310}-types
+    py{312,313}-djmain
+    py{310,311,312,313,py310}-dj5{1,2}
+    py{39,310,311,312,313,py39,py310}-dj42
+    py{39,310,311,312,313,py39,py310}-types
 
 
 # Don't run coverage when testing with pypy:
 # see https://github.com/nedbat/coveragepy/issues/1382
-[testenv:pypy{39,310}-dj4.2,pypy310-dj{5.0,5.1,5.2}]
+[testenv:pypy{39,310}-dj42,pypy310-dj5{1,2}]
 commands =
     pytest {toxinidir}/csp
 
-[testenv:{3.9,3.10,3.11,3.12,3.13,pypy39,pypy310}-types]
+[testenv:py{39,310,311,312,313,py39,py310}-types]
 commands =
     mypy --cache-dir {temp_dir}/.mypy_cache {toxinidir}/csp
 
@@ -26,32 +26,9 @@ setenv =
 commands =
     pytest --cov={toxinidir}/csp  {toxinidir}/csp
 
-basepython =
-    3.9: python3.9
-    3.10: python3.10
-    3.11: python3.11
-    3.12: python3.12
-    3.13: python3.13
-    pypy39: pypy3.9
-    pypy310: pypy3.10
-
 deps =
     pytest
-    dj4.2: Django>=4.2,<4.3
-    dj5.0: Django>=5.0.1,<5.1
-    dj5.1: Django>=5.1,<5.2
-    dj5.2: Django>=5.2a1,<5.3
+    dj42: Django>=4.2,<4.3
+    dj51: Django>=5.1,<5.2
+    dj52: Django>=5.2,<5.3
     djmain: https://github.com/django/django/archive/main.tar.gz
-
-
-[gh-actions]
-# Running tox in GHA without redefining it all in a GHA matrix:
-# https://github.com/ymyzk/tox-gh-actions
-python =
-    3.9: 3.9
-    3.10: 3.10
-    3.11: 3.11
-    3.12: 3.12
-    3.13: 3.13
-    pypy-3.9: pypy39
-    pypy-3.10: pypy310

From fa800478d5cf53dcf429d0688ed5bd7e9eb5d353 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Fri, 23 May 2025 01:14:54 +0200
Subject: [PATCH 2/3] Generate CI matrix from envlist

---
 .github/workflows/ci.yaml | 54 ++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 15244d6..3165434 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,44 +1,56 @@
-name: "CI" # Note that this name appears in the README's badge
+name: "CI" # This name also appears on the badge in README and PyPI
+
 on:
   push:
     branches:
       - main
-  workflow_dispatch:
   pull_request:
+  workflow_dispatch:
   release:
     types: [published]
+
 jobs:
-  run-tests:
+  tox:
+    runs-on: ubuntu-latest
+    outputs:
+      envlist: ${{ steps.tox.outputs.envlist }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+          cache: pip
+      - name: Install tox and plugins
+        run: pip install tox tox-gh-matrix
+      - name: Get tox matrix
+        id: tox
+        run: tox --gh-matrix
+
+  test:
+    name: Test ${{ matrix.tox.name }}
     runs-on: ubuntu-latest
+    needs: tox
     strategy:
+      fail-fast: false
       matrix:
-        python-version:
-            - '3.9'
-            - '3.10'
-            - '3.11'
-            - '3.12'
-            - '3.13'
-            - 'pypy-3.9'
-            - 'pypy-3.10'
-
+        tox: ${{ fromJSON(needs.tox.outputs.envlist) }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python ${{ matrix.tox.python.version }}
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install tox tox-gh-actions
-    - name: Test with tox
-      run: tox
+        python-version: ${{ matrix.tox.python.spec }}
+        cache: pip
+    - name: Install tox
+      run: pip install tox
+    - name: Test ${{ matrix.tox.name }}
+      run: tox -e ${{ matrix.tox.name }}
 
   release:
     name: Release django-csp
     if: github.event_name == 'release' && github.event.action == 'published'
     needs:
-      - run-tests
+      - test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

From 28a327e988f75143d35d012d8a2f165bee919415 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Fri, 23 May 2025 01:24:20 +0200
Subject: [PATCH 3/3] Add verbosity

---
 .github/workflows/ci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3165434..1c8e285 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,6 +11,7 @@ on:
 
 jobs:
   tox:
+    name: Configure test matrix
     runs-on: ubuntu-latest
     outputs:
       envlist: ${{ steps.tox.outputs.envlist }}
@@ -25,6 +26,8 @@ jobs:
       - name: Get tox matrix
         id: tox
         run: tox --gh-matrix
+      - name: Log saved outputs
+        run: echo ${{ steps.tox.outputs.envlist }}
 
   test:
     name: Test ${{ matrix.tox.name }}