diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2c57cba90..a344ba8f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,19 +16,13 @@ jobs: max-parallel: 5 matrix: python-version: ['3.7', '3.8', '3.9', '3.10'] - django-version: ['2.2', '3.1', '3.2', 'main'] - drf-version: ['3.10', '3.11', '3.12'] + django-version: ['2.2', '3.2', '4.0', 'main'] + drf-version: ['3.10', '3.11', '3.12', '3.13'] exclude: - python-version: '3.7' django-version: 'main' - - python-version: '3.8' - django-version: 'main' - - django-version: '3.1' - drf-version: '3.10' - python-version: '3.10' django-version: '2.2' - - python-version: '3.10' - django-version: '3.1' steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 3d4e7e235..286921f00 100755 --- a/setup.py +++ b/setup.py @@ -66,8 +66,8 @@ "Environment :: Web Environment", "Framework :: Django", "Framework :: Django :: 2.2", - "Framework :: Django :: 3.1", "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", diff --git a/tox.ini b/tox.ini index 8839a7ef4..bcd2cd76c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,29 +1,28 @@ [tox] envlist= py{37,38,39}-dj22-drf310-tests - py{37,38,39}-dj{22,31}-drf{311,312}-tests - py{37,38,39,310}-dj32-drf{311,312}-tests - py{38,39,310}-djmain-drf312-tests + py{37,38,39,310}-dj{22,32}-drf{311,312,313}-tests + py{38,39,310}-dj{40,main}-drf313-tests docs [gh-actions] python= 3.7: py37 - 3.8: py38, docs, lint + 3.8: py38, docs 3.9: py39 3.10: py310 [gh-actions:env] DJANGO= 2.2: dj22 - 3.0: dj30 - 3.1: dj31 3.2: dj32 + 4.0: dj40 main: djmain DRF= 3.10: drf310 3.11: drf311 3.12: drf312 + 3.13: drf313 [testenv] usedevelop=True @@ -35,13 +34,13 @@ setenv= PYTHONDONTWRITEBYTECODE=1 deps= dj22: Django>=2.2,<2.3 - dj31: Django>=3.1,<3.2 dj32: Django>=3.2,<3.3 + dj40: Django>=4.0,<4.1 drf310: djangorestframework>=3.10,<3.11 drf311: djangorestframework>=3.11,<3.12 drf312: djangorestframework>=3.12,<3.13 + drf313: djangorestframework>=3.13,<3.14 djmain: https://github.com/django/django/archive/main.tar.gz - djmain: pytz allowlist_externals=make [testenv:docs]