Skip to content

Commit ceb8160

Browse files
committed
Add DRF 3.7 to the test matrix.
Fixes django-json-api#388
1 parent b0257c0 commit ceb8160

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ python:
88
- "3.5"
99
- "3.6"
1010
env:
11-
- DJANGO=">=1.11,<1.12" DRF=">=3.6.3,<3.7"
11+
- DJANGO=">=1.11,>=2.0,<2.1" DRF=">=3.6.3,>=3.7.0,<3.8"
1212
before_install:
1313
# Force an upgrade of py & pytest to avoid VersionConflict
1414
- pip install --upgrade py

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
v2.4.0
22

3+
* Add support for Django REST Framework 3.7.x.
4+
* Add support for Django 2.0.
35
* Drop support for Django 1.8 - 1.10 (EOL)
46
* Drop support for Django REST Framework < 3.6.3
57
(3.6.3 is the first to support Django 1.11)

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ Requirements
6868
------------
6969

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

7474
------------
7575
Installation

docs/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ like the following:
5252
## Requirements
5353

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

5858
## Installation
5959

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[tox]
22
envlist =
3-
py{27,34,35,36}-django111-drf{36},
3+
py{27,34,35,36}-django111-drf{36,37},
44

55
[testenv]
66
deps =
77
django111: Django>=1.11,<1.12
88
drf36: djangorestframework>=3.6.3,<3.7
9+
drf37: djangorestframework>=3.7.0,<3.8
910

1011
setenv =
1112
PYTHONPATH = {toxinidir}

0 commit comments

Comments
 (0)