Try reset tests

Frojd · Aug 21, 2024 · 8ad8d94 · 8ad8d94
1 parent 20d98b7
commit 8ad8d94
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 24 deletions.
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2 
+        uses: actions/setup-python@v1
         with:
           python-version: 3.8
       - name: Install dependencies
@@ -22,17 +22,50 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.11"] 
         tox_env:
-          - py311-dj41-wt41
-          - py311-dj41-wt50
-          - py311-dj41-wt51
-          - py311-dj41-wt52
-          - py311-dj41-wt60
+          - py310-dj32-wt41
+          - py310-dj40-wt41
+          - py310-dj40-wt42
+          - py310-dj41-wt40
+          - py310-dj41-wt41
+          - py310-dj41-wt42
+          - py38-dj32-wt41
+          - py38-dj41-wt41
+          - py38-dj41-wt42
+          - py38-dj41-wt41
+          - py39-dj32-wt41
+          - py39-dj40-wt41
+          - py39-dj41-wt41
+          - py39-dj41-wt42
+        include:
+          - python-version: 3.8
+            tox_env: py38-dj32-wt41
+          - python-version: 3.8
+            tox_env: py38-dj40-wt41
+          - python-version: 3.8
+            tox_env: py38-dj41-wt41
+          - python-version: 3.8
+            tox_env: py38-dj41-wt42
+          - python-version: 3.9
+            tox_env: py39-dj32-wt41
+          - python-version: 3.9
+            tox_env: py39-dj40-wt41
+          - python-version: 3.9
+            tox_env: py39-dj41-wt41
+          - python-version: 3.9
+            tox_env: py39-dj41-wt42
+          - python-version: "3.10"
+            tox_env: py310-dj32-wt41
+          - python-version: "3.10"
+            tox_env: py310-dj40-wt41
+          - python-version: "3.10"
+            tox_env: py310-dj41-wt41
+          - python-version: "3.10"
+            tox_env: py310-dj41-wt42
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2 
+        uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -43,7 +76,7 @@ jobs:
         run: tox -e ${{ matrix.tox_env }} -- index-url=https://pypi.python.org/simple/
       - name: Prepare artifacts
         run: mkdir -p .coverage-data && mv .coverage.* .coverage-data/
-      - uses: actions/upload-artifact@v3 #
+      - uses: actions/upload-artifact@master
         with:
           name: coverage-data
           path: .coverage-data/
@@ -53,12 +86,12 @@ jobs:
     needs: [test]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v3 
+      - uses: actions/download-artifact@master
         with:
           name: coverage-data
           path: .
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2 
+        uses: actions/setup-python@v1
         with:
           python-version: 3.8
       - name: Install dependencies
@@ -68,4 +101,4 @@ jobs:
       - name: Prepare Coverage report
         run: tox -e coverage-report
       - name: Upload to codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v1.0.6
diff --git a/tox.ini b/tox.ini
@@ -1,30 +1,31 @@
 [tox]
 envlist =
     flake8
-    py{311,312}-dj{41}-wt{41,50,51,52,60}
+    py{38,39,310}-dj{32,40,41}-wt{41,42}
 
 [gh-actions]
 python =
-    "3.11": py311
-    "3.12": py312
+    3.8: py38
+    3.9: py39
+    "3.10": py310
 
 [testenv]
 deps =
     coverage
     mock
+    dj32: Django>=3.2,<3.3
+    dj40: Django>=4.0,<4.1
     dj41: Django>=4.1,<4.2
     wt41: wagtail>=4.1,<4.2
-    wt50: wagtail>=5.0,<5.1
-    wt51: wagtail>=5.1,<5.2
-    wt52: wagtail>=5.2,<5.3
-    wt60: wagtail>=6.0,<6.1
+    wt42: wagtail>=4.2,<4.3
 
 commands =
     coverage run manage.py test
 
 basepython =
-    py311: python3.11
-    py312: python3.12
+    py38: python3.8
+    py39: python3.9
+    py310: python3.10
 
 setenv =
     DJANGO_SETTINGS_MODULE=tests.settings
@@ -46,7 +47,7 @@ commands =
 ignore_errors = True
 
 [testenv:flake8]
-basepython = python3.11
+basepython = python3.8
 deps = flake8
 commands = flake8 wagtailstreamforms
 
@@ -64,7 +65,7 @@ exclude =
 max-line-length = 120
 
 [testenv:coverage-report]
-basepython = python3.11
+basepython = python3.8
 deps = coverage[toml]
 skip_install = true
 commands =
@@ -73,7 +74,7 @@ commands =
     coverage report
 
 [testenv:format]
-basepython = python3.11
+basepython = python3.8
 deps =
     isort
     black