From 910283872f95c6f15592d92d150075f1e057e42b Mon Sep 17 00:00:00 2001
From: Jonathan Willitts <JonathanWillitts@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:49:41 +0100
Subject: [PATCH] Align Tox, GH Actions, setup.cfg (py312,dj42,dj51)

---
 .github/workflows/build.yml | 10 +++++-----
 pyproject.toml              | 10 +++++-----
 setup.cfg                   |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 834bff1..e3d9dca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,9 +6,9 @@ on: [push, pull_request]
 jobs:
   build:
     name: >
-      ${{ matrix.codebase }}-
-      Py${{ matrix.python-version }}-
-      Dj${{ matrix.django-version }}-
+      ${{ matrix.codebase }} /
+      py${{ matrix.python-version }} /
+      dj${{ matrix.django-version }} /
       ${{ matrix.database-engine }}
     runs-on: ubuntu-latest
 
@@ -16,8 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         codebase: ['Prod', 'Dev']
-        django-version: ['4.2', '5.1', 'dev']
         python-version: ['3.12']
+        django-version: ['4.2', '5.1', 'dev']
         database-engine: ["mysql", "postgres"]
         exclude:
           - codebase: 'Prod'
@@ -43,6 +43,7 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
+
     steps:
       - name: Install pycups and words dependency
         run: |
@@ -75,7 +76,6 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/tox.txt
 
-
       - name: Tox tests
         run: |
           tox -v
diff --git a/pyproject.toml b/pyproject.toml
index 526dee2..aa29e4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,8 +35,8 @@ exclude_lines = [
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{312}-dj{50}-edc{prod},
-    py{312}-dj{50,dev}-edc{dev},
+    py{312}-dj{42,51}-edc{prod,dev},
+    py{312}-dj{dev}-edc{dev},
     lint
 
 isolated_build = true
@@ -48,7 +48,7 @@ python =
 [gh-actions:env]
 DJANGO =
     4.2: dj42
-    5.0: dj50, lint
+    5.1: dj51, lint
     dev: djdev
 EDC_CODEBASE =
     Prod: edcprod, lint
@@ -60,7 +60,7 @@ deps =
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/test_utils.txt
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt
     dj42: Django>=4.2,<5.0
-    dj50: Django>=5.0,<6.0
+    dj51: Django>=5.1,<5.2
     djdev: https://github.com/django/django/tarball/main
 
 commands =
@@ -69,7 +69,7 @@ commands =
     edcdev: pip install -U -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
     edcdev: pip install -U git+https://github.com/intecomm-trial/intecomm-form-validators.git@develop
     pip freeze
-    coverage run runtests.py
+    coverage run -a runtests.py
     coverage report
 
 [testenv:lint]
diff --git a/setup.cfg b/setup.cfg
index c6a15bb..6087246 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,7 +20,6 @@ classifiers=
     Programming Language :: Python :: 3.12
     License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 
-
 [options]
 python_requires = >=3.12
 zip_safe = False