migrate from tox-gh-actions to tox-gh

jazzband · Nov 14, 2024 · 150ee21 · 150ee21
1 parent 5bbfbb7
commit 150ee21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 45 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    name: test with Python ${{ matrix.python-version }} and Django ${{ matrix.django-version }}
+    name: test with Python ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -16,30 +16,6 @@ jobs:
           - '3.10'
           - '3.11'
           - '3.12'
-        django-version:
-          - '3.2'
-          - '4.0'
-          - '4.2'
-          - '5.0'
-          - '5.1'
-          - 'main'
-        exclude:
-          - python-version: '3.11'
-            django-version: '3.2'
-          - python-version: '3.12'
-            django-version: '3.2'
-          - django-version: '5.0'
-            python-version: '3.8'
-          - django-version: '5.0'
-            python-version: '3.9'
-          - django-version: '5.1'
-            python-version: '3.8'
-          - django-version: '5.1'
-            python-version: '3.9'
-          - django-version: 'main'
-            python-version: '3.8'
-          - django-version: 'main'
-            python-version: '3.9'
 
     services:
       postgres:
@@ -70,5 +46,4 @@ jobs:
       run: uv run --only-dev tox -v
       env:
         TOX_GH_MAJOR_MINOR: ${{ matrix.python-version }}
-        DJANGO: ${{ matrix.django-version }}
         TEST_WITH_POSTGRES: 1
diff --git a/tox.ini b/tox.ini
@@ -1,30 +1,21 @@
 [tox]
 envlist =
-    py{38,39,310}-dj32
-    py{38,39,310,311,312}-dj40
-    py{38,39,310,311,312}-dj42
-    py{310,311,312}-dj50
-    py{310,311,312}-dj51
+     py38-dj{32,40,42}
+     py39-dj{32,40,42}
+    py310-dj{32,40,42,50,51}
+    py311-dj{   40,42,50,51}
+    py312-dj{   40,42,50,51}
     lint
     check
 skipsdist = True
 
 [gh]
 python =
-    3.8 = 3.8
-    3.9 = 3.9
-    3.10 = 3.10, lint, check
-    3.11 = 3.11
-    3.12 = 3.12
-
-; [gh-actions:env]
-; DJANGO =
-;     3.2: dj32
-;     4.0: dj40
-;     4.2: dj42
-;     5.0: dj50
-;     5.1: dj51
-;     main: djmain
+    3.8  =  py38-dj32,  py38-dj40,  py38-dj42
+    3.9  =  py39-dj32,  py39-dj40,  py39-dj42
+    3.10 = py310-dj32, py310-dj40, py310-dj42, py310-dj50, py310-dj51, lint, check
+    3.11 =             py311-dj40, py311-dj42, py311-dj50, py311-dj51
+    3.12 =             py312-dj40, py312-dj42, py312-dj50, py312-dj51
 
 [testenv]
 deps =