diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3cdf66a..c9dc7df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: max-parallel: 5 matrix: python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3'] - django-version: ['2.2', '3.0', '3.1', 'master', 'none'] + target: ['2.2', '3.0', '3.1', 'master', 'qa'] steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: run: | tox -v env: - DJANGO: '${{ matrix.django-version }}' + TARGET: '${{ matrix.target }}' - name: Upload coverage diff --git a/tox.ini b/tox.ini index 998aefc..078bf44 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py38-qa - py{36,37,38,39,py3}-django{22,30,31,master} + py{36,37,38,39,py3}-dj{22,30,31,master} [gh-actions] python = @@ -12,20 +12,20 @@ python = pypy3: pypy3 [gh-actions:env] -DJANGO = - 2.2: django22 - 3.0: django30 - 3.1: django31 - master: djangomaster - none: qa +TARGET = + 2.2: dj22 + 3.0: dj30 + 3.1: dj31 + master: djmaster + qa: qa [testenv] deps = -r requirements-test.txt - django22: django>=2.2,<2.3 - django30: django>=3.0,<3.1 - django31: django>=3.1,<3.2 - djangomaster: https://github.com/django/django/archive/master.tar.gz + 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 usedevelop = True commands = pytest setenv =