From c998e7a595d5b3b267a990dc00de613e20e46da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksi=20H=C3=A4kli?= <aleksi.hakli@iki.fi>
Date: Tue, 5 Jan 2021 15:32:11 +0200
Subject: [PATCH] Separate tox QA step from other commands

---
 .github/workflows/test.yml |  7 +++++++
 tox.ini                    | 11 +++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bb8ef4a..b6095c0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,11 @@ jobs:
       max-parallel: 5
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
+        django-version: ['2.2', '3.0', '3.1', 'dev']
+        # Tox configuration for QA environment
+        include:
+          - python-version: '3.8'
+            django-version: 'qa'
 
     steps:
     - uses: actions/checkout@v2
@@ -41,6 +46,8 @@ jobs:
     - name: Tox tests
       run: |
         tox -v
+      env:
+        DJANGO: ${{ matrix.django-version }}
 
     - name: Upload coverage
       uses: codecov/codecov-action@v1
diff --git a/tox.ini b/tox.ini
index 63574d4..ef4c7ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py38-qa
-    py{36,37,38,39,py3}-dj{22,30,31,master}
+    py38-djqa
+    py{36,37,38,39,py3}-dj{22,30,31,dev}
 
 [gh-actions]
 python =
@@ -17,18 +17,17 @@ deps =
     dj22: django>=2.2,<2.3
     dj30: django>=3.0,<3.1
     dj31: django>=3.1,<3.2
-    djmaster: https://github.com/django/django/archive/master.tar.gz
+    djdev: https://github.com/django/django/archive/master.tar.gz
 usedevelop = true
 commands = pytest
 setenv =
     PYTHONDONTWRITEBYTECODE=1
 
-[testenv:py{36,37,38,39,py3}-dj{master}]
+[testenv:py{36,37,38,39,py3}-dj{dev}]
 ignore_errors = true
 ignore_outcome = true
 
-[testenv:py38-qa]
-basepython = python3.8
+[testenv:py38-djqa]
 deps = -r requirements-qa.txt
 commands =
     mypy axes