Bump test matrix

rremizov · Aug 16, 2023 · c0315e2 · c0315e2
1 parent e87b5ad
commit c0315e2
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 95 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ name: CI
 jobs:
   run-tests:
     name: Run Tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     container: python:${{ matrix.env.python }}-buster
 
     strategy:
@@ -19,85 +19,44 @@ jobs:
           - postgresql
           - mysql
         env:
-          - python: 2.7
-            django: 1.11
-            tox-env: py27-dj111
-
-          - python: 3.6
-            django: 1.11
-            tox-env: py36-dj111
-          - python: 3.6
-            django: 2.0
-            tox-env: py36-dj20
-          - python: 3.6
-            django: 2.1
-            tox-env: py36-dj21
-          - python: 3.6
-            django: 2.2
-            tox-env: py36-dj22
-          - python: 3.6
-            django: 3.0
-            tox-env: py36-dj30
-          - python: 3.6
-            django: 3.1
-            tox-env: py36-dj31
-
-          - python: 3.7
-            django: 1.11
-            tox-env: py37-dj111
-          - python: 3.7
-            django: 2.0
-            tox-env: py37-dj20
-          - python: 3.7
-            django: 2.1
-            tox-env: py37-dj21
-          - python: 3.7
-            django: 2.2
-            tox-env: py37-dj22
-          - python: 3.7
-            django: 3.0
-            tox-env: py37-dj30
-          - python: 3.7
-            django: 3.1
-            tox-env: py37-dj31
-
-          - python: 3.8
-            django: 1.11
-            tox-env: py38-dj111
-          - python: 3.8
-            django: 2.0
-            tox-env: py38-dj20
-          - python: 3.8
-            django: 2.1
-            tox-env: py38-dj21
-          - python: 3.8
-            django: 2.2
-            tox-env: py38-dj22
           - python: 3.8
-            django: 3.0
-            tox-env: py38-dj30
+            django: 3.2
+            tox-env: py38-dj32
           - python: 3.8
-            django: 3.1
-            tox-env: py38-dj31
-
-#          - python: 3.9
-#            django: 1.11
-#            tox-env: py39-dj111
-#          - python: 3.9
-#            django: 2.0
-#            tox-env: py39-dj20
-#          - python: 3.9
-#            django: 2.1
-#            tox-env: py39-dj21
-#          - python: 3.9
-#            django: 2.2
-#            tox-env: py39-dj22
-#          - python: 3.9
-#            django: 3.0
-#            tox-env: py39-dj30
-#          - python: 3.9
-#            django: 3.1
-#            tox-env: py39-dj31
+            django: 4.0
+            tox-env: py38-dj40
+
+          - python: 3.9
+            django: 3.2
+            tox-env: py39-dj32
+          - python: 3.9
+            django: 4.0
+            tox-env: py39-dj40
+
+          - python: 3.10
+            django: 3.2
+            tox-env: py310-dj32
+          - python: 3.10
+            django: 4.0
+            tox-env: py310-dj40
+          - python: 3.10
+            django: 4.1
+            tox-env: py310-dj41
+
+          - python: 3.11
+            django: 4.1
+            tox-env: py311-dj41
+          - python: 3.11
+            django: 4.2
+            tox-env: py311-dj42
+
+          - python: 3.12
+            django: 4.1
+            tox-env: py312-dj41
+          - python: 3.12
+            django: 4.2
+            tox-env: py312-dj42
+
 
     services:
       postgres:

diff --git a/tox.ini b/tox.ini
@@ -1,19 +1,20 @@
 [tox]
+; https://www.python.org/downloads/
+; https://www.djangoproject.com/download/
 minversion = 3.6
 envlist =
-    py36-dj{111,20,21,22,30,31},
-    py37-dj{111,20,21,22,30,31},
-    py38-dj{111,20,21,22,30,31},
-    py39-dj{111,20,21,22,30,31},
+    py38-dj{32,40},
+    py39-dj{32,40},
+    py310-dj{32,40,41},
+    py311-dj{41,42},
+    py312-dj{41,42},
 
 [travis:env]
 DJANGO =
-    1.11: dj111
-    2.0: dj20
-    2.1: dj21
-    2.2: dj22
-    3.0: dj30
-    3.1: dj31
+    3.2: dj32
+    4.0: dj40
+    4.1: dj41
+    4.2: dj42
 
 [testenv]
 passenv =
@@ -23,13 +24,11 @@ passenv =
 setenv =
     DJANGO_SETTINGS_MODULE=tests.settings
 deps =
-    dj111: Django>=1.11,<1.12
-    dj20: Django>=2.0,<2.1
-    dj21: Django>=2.1,<2.2
-    dj22: Django>=2.2,<2.3
-    dj30: Django>=3.0,<3.1
-    dj31: Django>=3.1,<3.2
+    dj32: Django>=3.2,<3.3
+    dj40: Django>=4.0,<4.1
+    dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<4.3
     djmaster: git+https://github.com/django/django
-    py{36,37,38,39}: -r {toxinidir}/requirements-test.txt
+    py{38,39,310,311,312}: -r {toxinidir}/requirements-test.txt
 commands =
     py.test --benchmark-skip