From 05682997a824f7acd68e4f26a5e9a19e355aa95f Mon Sep 17 00:00:00 2001
From: "nick.moreton" <nick.moreton@torchbox.com>
Date: Tue, 8 Nov 2022 13:06:47 +0000
Subject: [PATCH] Adjust github workflow

---
 .github/workflows/python-test.yml | 68 ++++---------------------------
 Makefile                          | 13 ++++++
 tox.ini                           |  2 +-
 3 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index 266a05a..77fce12 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -22,72 +22,20 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        tox_env:
-          - py37-dj22-wt211
-          - py37-dj22-wt212
-          - py37-dj22-wt213
-          - py38-dj22-wt211
-          - py38-dj22-wt212
-          - py38-dj22-wt213
-          - py37-dj30-wt211
-          - py37-dj30-wt212
-          - py37-dj30-wt213
-          - py38-dj30-wt211
-          - py38-dj30-wt212
-          - py38-dj30-wt213
-        include:
-          - python-version: 3.7
-            tox_env: py37-dj22-wt211
-          - python-version: 3.7
-            tox_env: py37-dj22-wt212
-          - python-version: 3.7
-            tox_env: py37-dj22-wt213
-          - python-version: 3.8
-            tox_env: py38-dj22-wt211
-          - python-version: 3.8
-            tox_env: py38-dj22-wt212
-          - python-version: 3.8
-            tox_env: py38-dj22-wt213
-          - python-version: 3.7
-            tox_env: py37-dj30-wt211
-          - python-version: 3.7
-            tox_env: py37-dj30-wt212
-          - python-version: 3.7
-            tox_env: py37-dj30-wt213
-          - python-version: 3.8
-            tox_env: py38-dj30-wt211
-          - python-version: 3.8
-            tox_env: py38-dj30-wt212
-          - python-version: 3.8
-            tox_env: py38-dj30-wt213
-          - python-version: 3.9
-            tox_env: py39-dj31-wt214
-          - python-version: 3.9
-            tox_env: py39-dj32-wt214
-          - python-version: 3.9
-            tox_env: py39-dj31-wt215
-          - python-version: 3.9
-            tox_env: py39-dj32-wt215
-          - python-version: 3.9
-            tox_env: py39-dj32-wt216
-          - python-version: 3.9
-            tox_env: py39-dj40-wt216
-          - python-version: 3.9
-            tox_env: py39-dj32-wt30
-          - python-version: 3.9
-            tox_env: py39-dj40-wt30
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions
+          python -m pip install tox tox-gh-actions
       - name: Test with tox
-        run: tox -e ${{ matrix.tox_env }} --index-url=https://pypi.python.org/simple/
+        run: tox
       - name: Prepare artifacts
         run: mkdir -p .coverage-data && mv .coverage.* .coverage-data/
       - uses: actions/upload-artifact@master
diff --git a/Makefile b/Makefile
index 5ba202a..42a2959 100644
--- a/Makefile
+++ b/Makefile
@@ -53,3 +53,16 @@ release:
 	rm -rf dist/*
 	python setup.py sdist bdist_wheel
 	twine upload -s dist/*
+
+
+test-215:
+	tox -e py38-dj32-wt215
+
+test-30:
+	tox -e py38-dj40-wt30
+
+test-40:
+	tox -e py38-dj40-wt40
+
+test-41:
+	tox -e py38-dj41-wt41
diff --git a/tox.ini b/tox.ini
index bfc9d68..96b0202 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     flake8
-    py{37,38,39,310,311}-dj{32}-wt{214,215}
+    py{37,38,39,310,311}-dj{32}-wt{215}
     py{38,39,310,311}-dj{32,40}-wt{216,30,40,41}
 
 [gh-actions]