From 196c748a9f97c1a112f03db6d24c5ed3cd3b467f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Stenstr=C3=B6m?= <emil@emilstenstrom.se>
Date: Sat, 25 Mar 2023 09:29:22 +0100
Subject: [PATCH] Upgrade CI to latest version, and simplify tox.ini

---
 .github/workflows/tests.yml | 26 ++++++++++++--------------
 tox.ini                     | 16 +++++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bb1f29c1..601ce80b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,28 +1,26 @@
 name: Run tests
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 
 jobs:
-  run-tests:
-    runs-on: ubuntu-20.04
+  build:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version:
-          - "3.6"
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - 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: Run tests
-      run: |
-        tox
+      run: tox -vv
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index c61f8107..9484f4ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,18 +3,20 @@
 
 [tox]
 envlist =
-  py{36,37}-django{32}
-  py{38,39}-django{32,40}
+  py36-django{32}
+  py37-django{32}
+  py38-django{32,40}
+  py39-django{32,40}
   py310-django{40}
   flake8
   isort
 
 [gh-actions]
-3.6 = py36-django{32}
-3.7 = py37-django{32}
-3.8 = py38-django{32,40}
-3.9 = py39-django{32,40}
-3.10 = py310-django{40}, flake8, isort
+3.6 = py36
+3.7 = py37
+3.8 = py38
+3.9 = py39
+3.10 = py310, flake8, isort
 
 [testenv]
 deps =