diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 93b6be3f..bdc04472 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,8 +11,18 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false - matrix: + matrix: # https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django + django-version: ["3.2", "4.2", "5.0"] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10'] + exclude: + - django-version: "3.2" + python-version: "3.11" + - django-version: "3.2" + python-version: "3.12" + - django-version: "5.0" + python-version: "3.8" + - django-version: "5.0" + python-version: "3.9" services: rabbitmq: @@ -31,4 +41,6 @@ jobs: python -m pip install --upgrade pip python -m pip install tox tox-gh-actions - name: Test with tox - run: tox -vv + run: tox + env: + DJANGO: ${{ matrix.django-version }} diff --git a/requirements/test-django32.txt b/requirements/test-django32.txt deleted file mode 100644 index 63588fcc..00000000 --- a/requirements/test-django32.txt +++ /dev/null @@ -1 +0,0 @@ -django>=3.2.13,<4.0 diff --git a/requirements/test-django40.txt b/requirements/test-django40.txt deleted file mode 100644 index 2f080345..00000000 --- a/requirements/test-django40.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.0.4,<4.1 diff --git a/requirements/test-django41.txt b/requirements/test-django41.txt deleted file mode 100644 index 39d54abf..00000000 --- a/requirements/test-django41.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.1.4,<4.2 diff --git a/requirements/test-django42.txt b/requirements/test-django42.txt deleted file mode 100644 index 00938415..00000000 --- a/requirements/test-django42.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.2,<5.0 diff --git a/requirements/test-django50.txt b/requirements/test-django50.txt deleted file mode 100644 index db44a27d..00000000 --- a/requirements/test-django50.txt +++ /dev/null @@ -1 +0,0 @@ -django>=5.0,<5.1 diff --git a/tox.ini b/tox.ini index 7608ebb8..78ee8274 100644 --- a/tox.ini +++ b/tox.ini @@ -1,3 +1,5 @@ +; https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django + [gh-actions] python = 3.8: py38, apicheck, linkcheck @@ -16,12 +18,12 @@ DJANGO = [tox] envlist = - py38-django{32,41,42} - py39-django{32,41,42} - py310-django{32,41,42,50} - py311-django{41,42,50} - py312-django{41,42,50} - pypy3-django{32,41,42,50} + py38-django{32,42} + py39-django{32,42} + py310-django{32,42,50} + py311-django{42,50} + py312-django{42,50} + pypy3-django{32,42,50} flake8 apicheck linkcheck @@ -36,10 +38,10 @@ deps= cov: -r{toxinidir}/requirements/test-django.txt - django32: -r{toxinidir}/requirements/test-django32.txt - django41: -r{toxinidir}/requirements/test-django41.txt - django42: -r{toxinidir}/requirements/test-django42.txt - django50: -r{toxinidir}/requirements/test-django50.txt + django32: Django ~= 3.2 + django41: Django ~= 4.1 + django42: Django ~= 4.2 + django50: Django ~= 5.0 linkcheck,apicheck: -r{toxinidir}/requirements/docs.txt flake8,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt