From b5a1fd1787691572580364c7f06a74a8cf608af6 Mon Sep 17 00:00:00 2001 From: Oliver Sauder Date: Wed, 13 Jun 2018 16:56:50 +0200 Subject: [PATCH] Add support for Django REST Framework 3.8.x No code changes needed. --- .travis.yml | 15 +++++++++++++++ CHANGELOG.md | 1 + README.rst | 2 +- docs/getting-started.md | 2 +- tox.ini | 5 +++-- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09cd5729..9c102172 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,27 +8,42 @@ matrix: env: TOXENV=py27-django111-drf36 - python: 2.7 env: TOXENV=py27-django111-drf37 + - python: 2.7 + env: TOXENV=py27-django111-drf38 - python: 3.4 env: TOXENV=py34-django111-drf36 - python: 3.4 env: TOXENV=py34-django111-drf37 + - python: 3.4 + env: TOXENV=py34-django111-drf38 - python: 3.4 env: TOXENV=py34-django20-drf37 + - python: 3.4 + env: TOXENV=py34-django20-drf38 - python: 3.5 env: TOXENV=py35-django111-drf36 - python: 3.5 env: TOXENV=py35-django111-drf37 + - python: 3.5 + env: TOXENV=py35-django111-drf38 - python: 3.5 env: TOXENV=py35-django20-drf37 + - python: 3.5 + env: TOXENV=py35-django20-drf38 - python: 3.6 env: TOXENV=py36-django111-drf36 - python: 3.6 env: TOXENV=py36-django111-drf37 + - python: 3.6 + env: TOXENV=py36-django111-drf38 - python: 3.6 env: TOXENV=py36-django20-drf37 + - python: 3.6 + env: TOXENV=py36-django20-drf38 + - python: 3.6 env: TOXENV=flake8 - python: 3.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d85b52..04069795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ v2.5.0 - [unreleased] * JsonApiPageNumberPagination and JsonApiLimitOffsetPagination. See [usage docs](docs/usage.md#pagination). * Deprecates PageNumberPagination and LimitOffsetPagination. * Add ReadOnlyModelViewSet extension with prefetch mixins. +* Add support for Django REST Framework 3.8.x v2.4.0 - Released January 25, 2018 diff --git a/README.rst b/README.rst index 9f0dd9e2..1c8fb465 100644 --- a/README.rst +++ b/README.rst @@ -68,7 +68,7 @@ Requirements 1. Python (2.7, 3.4, 3.5, 3.6) 2. Django (1.11, 2.0) -3. Django REST Framework (3.6, 3.7) +3. Django REST Framework (3.6, 3.7, 3.8) ------------ Installation diff --git a/docs/getting-started.md b/docs/getting-started.md index 4b564418..d68bbdd3 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -53,7 +53,7 @@ like the following: 1. Python (2.7, 3.4, 3.5, 3.6) 2. Django (1.11, 2.0) -3. Django REST Framework (3.6, 3.7) +3. Django REST Framework (3.6, 3.7, 3.8) ## Installation diff --git a/tox.ini b/tox.ini index c5c341fb..d5cca046 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py{27,34,35,36}-django111-drf{36,37}, - py{34,35,36}-django20-drf{37}, + py{27,34,35,36}-django111-drf{36,37,38}, + py{34,35,36}-django20-drf{37,38}, [testenv] deps = @@ -9,6 +9,7 @@ deps = django20: Django>=2.0,<2.1 drf36: djangorestframework>=3.6.3,<3.7 drf37: djangorestframework>=3.7.0,<3.8 + drf38: djangorestframework>=3.8.0,<3.9 setenv = PYTHONPATH = {toxinidir}