Merge pull request #13 from torchbox-forks/update-tox-testing

Update tox testing
torchbox-forks · Dec 17, 2024 · 337f3c4 · 337f3c4
2 parents 510b526 + b589aaa
commit 337f3c4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,9 +1,9 @@
 version: 2
 jobs:
-  test_py38:
+  test_py39:
     working_directory: ~/wagtail-autocomplete-repo
     docker:
-      - image: cimg/python:3.8
+      - image: cimg/python:3.9
     steps:
       - checkout
       - run:
@@ -15,15 +15,15 @@ jobs:
             pip install ".[test]"
       - run:
           name: tests
-          command: venv/bin/tox -f py38
+          command: venv/bin/tox -f py39
       - run:
           name: flake8
           command: venv/bin/tox -e flake8
 
-  test_py39:
+  test_py310:
     working_directory: ~/wagtail-autocomplete-repo
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.10
     steps:
       - checkout
       - run:
@@ -35,15 +35,15 @@ jobs:
             pip install ".[test]"
       - run:
           name: tests
-          command: venv/bin/tox -f py39
+          command: venv/bin/tox -f py310
       - run:
           name: flake8
           command: venv/bin/tox -e flake8
 
-  test_py310:
+  test_py311:
     working_directory: ~/wagtail-autocomplete-repo
     docker:
-      - image: cimg/python:3.10
+      - image: cimg/python:3.11
     steps:
       - checkout
       - run:
@@ -55,15 +55,15 @@ jobs:
             pip install ".[test]"
       - run:
           name: tests
-          command: venv/bin/tox -f py310
+          command: venv/bin/tox -f py311
       - run:
           name: flake8
           command: venv/bin/tox -e flake8
 
-  test_py311:
+  test_py312:
     working_directory: ~/wagtail-autocomplete-repo
     docker:
-      - image: cimg/python:3.11
+      - image: cimg/python:3.12
     steps:
       - checkout
       - run:
@@ -75,7 +75,7 @@ jobs:
             pip install ".[test]"
       - run:
           name: tests
-          command: venv/bin/tox -f py311
+          command: venv/bin/tox -f py312
       - run:
           name: flake8
           command: venv/bin/tox -e flake8
@@ -84,7 +84,7 @@ workflows:
   version: 2
   build:
     jobs:
-      - test_py38
       - test_py39
       - test_py310
       - test_py311
+      - test_py312
diff --git a/tox.ini b/tox.ini
@@ -2,33 +2,40 @@
 skipsdist = True
 usedevelop = True
 envlist =
-    py{38,39,310}-dj{32,41}-wt{41,51,52}
-    py311-dj41-wt{41,51,52}
-    py311-dj42-wt{51,52}
+    py39-dj{32,40,41}-wt{41,42}
+    py39-dj{42}-wt{50,51,52}
+    py{310,311,312}-dj{42,50}-wt{60,61,62}
+    py{310,311,312}-dj{51}-wt{63}
 
 [testenv]
 install_command = pip install -e ".[test]" -U {opts} {packages}
 commands = py.test
 basepython =
-    py38: python3.8
     py39: python3.9
     py310: python3.10
     py311: python3.11
+    py312: python3.12
 deps =
     dj32: django>=3.2,<4.0
     dj41: django>=4.1,<4.2
     dj42: django>=4.2,<4.3
+    dj50: django>=5.0,<5.1
+    dj51: django>=5.1,<5.2
     wt41: wagtail>=4.1,<4.2
     wt42: wagtail>=4.2,<5.0
     wt50: wagtail>=5.0,<5.1
     wt51: wagtail>=5.1,<5.2
     wt52: wagtail>=5.2,<5.3
+    wt60: wagtail>=6.0,<6.1
+    wt61: wagtail>=6.1,<6.2
+    wt62: wagtail>=6.2,<6.3
+    wt63: wagtail>=6.3,<6.4
 
 [testenv:flake8]
 basepython =
-    py38: python3.8
     py39: python3.9
     py310: python3.10
     py311: python3.11
-deps = flake8>3.7
+    py312: python3.12
+deps = flake8>3.9
 commands = flake8 wagtailautocomplete