Skip to content

Commit 028f191

Browse files
authored
Merge pull request #441 from sliverc/drf38
Add support for Django REST Framework 3.8.x
2 parents 2b6a72c + b5a1fd1 commit 028f191

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

.travis.yml

+15
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,42 @@ matrix:
88
env: TOXENV=py27-django111-drf36
99
- python: 2.7
1010
env: TOXENV=py27-django111-drf37
11+
- python: 2.7
12+
env: TOXENV=py27-django111-drf38
1113

1214
- python: 3.4
1315
env: TOXENV=py34-django111-drf36
1416
- python: 3.4
1517
env: TOXENV=py34-django111-drf37
18+
- python: 3.4
19+
env: TOXENV=py34-django111-drf38
1620
- python: 3.4
1721
env: TOXENV=py34-django20-drf37
22+
- python: 3.4
23+
env: TOXENV=py34-django20-drf38
1824

1925
- python: 3.5
2026
env: TOXENV=py35-django111-drf36
2127
- python: 3.5
2228
env: TOXENV=py35-django111-drf37
29+
- python: 3.5
30+
env: TOXENV=py35-django111-drf38
2331
- python: 3.5
2432
env: TOXENV=py35-django20-drf37
33+
- python: 3.5
34+
env: TOXENV=py35-django20-drf38
2535

2636
- python: 3.6
2737
env: TOXENV=py36-django111-drf36
2838
- python: 3.6
2939
env: TOXENV=py36-django111-drf37
40+
- python: 3.6
41+
env: TOXENV=py36-django111-drf38
3042
- python: 3.6
3143
env: TOXENV=py36-django20-drf37
44+
- python: 3.6
45+
env: TOXENV=py36-django20-drf38
46+
3247
- python: 3.6
3348
env: TOXENV=flake8
3449
- python: 3.6

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ v2.5.0 - [unreleased]
33
* JsonApiPageNumberPagination and JsonApiLimitOffsetPagination. See [usage docs](docs/usage.md#pagination).
44
* Deprecates PageNumberPagination and LimitOffsetPagination.
55
* Add ReadOnlyModelViewSet extension with prefetch mixins.
6+
* Add support for Django REST Framework 3.8.x
67

78
v2.4.0 - Released January 25, 2018
89

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Requirements
6868

6969
1. Python (2.7, 3.4, 3.5, 3.6)
7070
2. Django (1.11, 2.0)
71-
3. Django REST Framework (3.6, 3.7)
71+
3. Django REST Framework (3.6, 3.7, 3.8)
7272

7373
------------
7474
Installation

docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ like the following:
5353

5454
1. Python (2.7, 3.4, 3.5, 3.6)
5555
2. Django (1.11, 2.0)
56-
3. Django REST Framework (3.6, 3.7)
56+
3. Django REST Framework (3.6, 3.7, 3.8)
5757

5858
## Installation
5959

tox.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
[tox]
22
envlist =
3-
py{27,34,35,36}-django111-drf{36,37},
4-
py{34,35,36}-django20-drf{37},
3+
py{27,34,35,36}-django111-drf{36,37,38},
4+
py{34,35,36}-django20-drf{37,38},
55

66
[testenv]
77
deps =
88
django111: Django>=1.11,<1.12
99
django20: Django>=2.0,<2.1
1010
drf36: djangorestframework>=3.6.3,<3.7
1111
drf37: djangorestframework>=3.7.0,<3.8
12+
drf38: djangorestframework>=3.8.0,<3.9
1213

1314
setenv =
1415
PYTHONPATH = {toxinidir}

0 commit comments

Comments
 (0)