Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[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 =
django111: Django>=1.11,<1.12
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}
Expand Down