diff --git a/.travis.yml b/.travis.yml index 00258f23..b459f10f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,21 +17,14 @@ matrix: - python: 3.6 env: TOXENV=flake8 - - python: 3.5 - env: TOXENV=py35-django111-drf39 - python: 3.5 env: TOXENV=py35-django111-drf310 - python: 3.5 env: TOXENV=py35-django111-drfmaster - - python: 3.5 - env: TOXENV=py35-django21-drf39 - python: 3.5 env: TOXENV=py35-django21-drf310 - python: 3.5 env: TOXENV=py35-django21-drfmaster - - python: 3.5 - dist: xenial - env: TOXENV=py35-django22-drf39 - python: 3.5 dist: xenial env: TOXENV=py35-django22-drf310 @@ -39,21 +32,14 @@ matrix: dist: xenial env: TOXENV=py35-django22-drfmaster - - python: 3.6 - env: TOXENV=py36-django111-drf39 - python: 3.6 env: TOXENV=py36-django111-drf310 - python: 3.6 env: TOXENV=py36-django111-drfmaster - - python: 3.6 - env: TOXENV=py36-django21-drf39 - python: 3.6 env: TOXENV=py36-django21-drf310 - python: 3.6 env: TOXENV=py36-django21-drfmaster - - python: 3.6 - dist: xenial - env: TOXENV=py36-django22-drf39 - python: 3.6 dist: xenial env: TOXENV=py36-django22-drf310 @@ -61,10 +47,6 @@ matrix: dist: xenial env: TOXENV=py36-django22-drfmaster - - python: 3.7 - dist: xenial - sudo: required - env: TOXENV=py37-django21-drf39 - python: 3.7 dist: xenial sudo: required @@ -73,10 +55,6 @@ matrix: dist: xenial sudo: required env: TOXENV=py37-django21-drfmaster - - python: 3.7 - dist: xenial - sudo: required - env: TOXENV=py37-django22-drf39 - python: 3.7 dist: xenial sudo: required diff --git a/CHANGELOG.md b/CHANGELOG.md index e43e850d..ae2e7999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ This release is not backwards compatible. For easy migration best upgrade first * Removed support for Python 2.7 and 3.4. * Removed support for Django Filter 1.1. * Removed obsolete dependency six. -* Removed support for Django REST Framework <=3.8. +* Removed support for Django REST Framework <=3.9. * Removed support for Django 2.0. * Removed obsolete mixins `MultipleIDMixin` and `PrefetchForIncludesHelperMixin` * Removed obsolete settings `JSON_API_FORMAT_KEYS`, `JSON_API_FORMAT_RELATION_KEYS` and diff --git a/README.rst b/README.rst index 3003b48b..4f3d8aaa 100644 --- a/README.rst +++ b/README.rst @@ -89,7 +89,7 @@ Requirements 1. Python (3.5, 3.6, 3.7) 2. Django (1.11, 2.1, 2.2) -3. Django REST Framework (3.9, 3.10) +3. Django REST Framework (3.10) ------------ Installation diff --git a/docs/getting-started.md b/docs/getting-started.md index b1d4f94e..93096d79 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -53,7 +53,7 @@ like the following: 1. Python (3.5, 3.6, 3.7) 2. Django (1.11, 2.1, 2.2) -3. Django REST Framework (3.9, 3.10) +3. Django REST Framework (3.10) ## Installation diff --git a/setup.py b/setup.py index 182ec084..302c4c1c 100755 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ def get_package_data(package): ], install_requires=[ 'inflection>=0.3.0', - 'djangorestframework>=3.9', + 'djangorestframework>=3.10', 'django>=1.11', ], setup_requires=pytest_runner + sphinx + wheel, diff --git a/tox.ini b/tox.ini index c67aff84..bcbff27d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,13 @@ [tox] envlist = - py{35,36}-django111-drf{39,310,master}, - py{35,36,37}-django{21,22}-drf{39,310,master}, + py{35,36}-django111-drf{310,master}, + py{35,36,37}-django{21,22}-drf{310,master}, [testenv] deps = django111: Django>=1.11,<1.12 django21: Django>=2.1,<2.2 django22: Django>=2.2,<2.3 - drf39: djangorestframework>=3.9.0,<3.10 drf310: djangorestframework>=3.10.2,<3.11 drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip