Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit 35e0ef8

Browse files
authored
Merge pull request #352 from felixxm/drf-3.6
Added DRF 3.6 support.
2 parents 2fe81c4 + a843767 commit 35e0ef8

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,59 @@ env:
1414
- TOX_ENV=py27-django1.8-drf3.3
1515
- TOX_ENV=py27-django1.8-drf3.4
1616
- TOX_ENV=py27-django1.8-drf3.5
17+
- TOX_ENV=py27-django1.8-drf3.6
1718

1819
- TOX_ENV=py27-django1.9-drf3.1
1920
- TOX_ENV=py27-django1.9-drf3.2
2021
- TOX_ENV=py27-django1.9-drf3.3
2122
- TOX_ENV=py27-django1.9-drf3.4
2223
- TOX_ENV=py27-django1.9-drf3.5
24+
- TOX_ENV=py27-django1.9-drf3.6
2325

2426
- TOX_ENV=py27-django1.10-drf3.4
2527
- TOX_ENV=py27-django1.10-drf3.5
28+
- TOX_ENV=py27-django1.10-drf3.6
2629

2730
- TOX_ENV=py27-django1.11-drf3.4
2831
- TOX_ENV=py27-django1.11-drf3.5
32+
- TOX_ENV=py27-django1.11-drf3.6
2933

3034
- TOX_ENV=py33-django1.8-drf3.1
3135
- TOX_ENV=py33-django1.8-drf3.2
3236
- TOX_ENV=py33-django1.8-drf3.3
3337
- TOX_ENV=py33-django1.8-drf3.4
3438
- TOX_ENV=py33-django1.8-drf3.5
39+
- TOX_ENV=py33-django1.8-drf3.6
3540

3641
- TOX_ENV=py34-django1.8-drf3.1
3742
- TOX_ENV=py34-django1.8-drf3.2
3843
- TOX_ENV=py34-django1.8-drf3.3
3944
- TOX_ENV=py34-django1.8-drf3.4
4045
- TOX_ENV=py34-django1.8-drf3.5
46+
- TOX_ENV=py34-django1.8-drf3.6
4147

4248
- TOX_ENV=py34-django1.9-drf3.1
4349
- TOX_ENV=py34-django1.9-drf3.2
4450
- TOX_ENV=py34-django1.9-drf3.3
4551
- TOX_ENV=py34-django1.9-drf3.4
4652
- TOX_ENV=py34-django1.9-drf3.5
53+
- TOX_ENV=py34-django1.9-drf3.6
4754

4855
- TOX_ENV=py34-django1.10-drf3.4
4956
- TOX_ENV=py34-django1.10-drf3.5
57+
- TOX_ENV=py34-django1.10-drf3.6
5058

5159
- TOX_ENV=py34-django1.11-drf3.4
5260
- TOX_ENV=py34-django1.11-drf3.5
61+
- TOX_ENV=py34-django1.11-drf3.6
5362

5463
- TOX_ENV=py35-django1.10-drf3.4
5564
- TOX_ENV=py35-django1.10-drf3.5
65+
- TOX_ENV=py35-django1.10-drf3.6
5666

5767
- TOX_ENV=py35-django1.11-drf3.4
5868
- TOX_ENV=py35-django1.11-drf3.5
69+
- TOX_ENV=py35-django1.11-drf3.6
5970

6071
matrix:
6172
fast_finish: true

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Requirements
2424

2525
- Python (2.7, 3.3, 3.4, 3.5)
2626
- Django (1.8, 1.9, 1.10, 1.11)
27-
- Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4, 3.5)
27+
- Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
2828

2929
Installation
3030
------------

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
py27-{flake8,docs},
4-
{py27,py33,py34,py35}-django{1.8,1.9,1.10,1.11}-drf{3.1,3.2,3.3,3.4,3.5}
4+
{py27,py33,py34,py35}-django{1.8,1.9,1.10,1.11}-drf{3.1,3.2,3.3,3.4,3.5,3.6}
55

66
[testenv]
77
commands = ./runtests.py --fast {posargs} --verbose
@@ -17,6 +17,7 @@ deps =
1717
drf3.3: djangorestframework<3.4
1818
drf3.4: djangorestframework<3.5
1919
drf3.5: djangorestframework<3.6
20+
drf3.6: djangorestframework<3.7
2021
py27-django{1.8,1.9}-drf{3.1,3.2,3.3,3.4}: djangorestframework-oauth==1.0.1
2122
-rrequirements/testing.txt
2223

0 commit comments

Comments
 (0)