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

Commit 160aaeb

Browse files
authored
Merge pull request #325 from orf/orf-patch-1
Test on Django 1.11
2 parents 9e89201 + fce8961 commit 160aaeb

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ python: '3.5'
22

33
language: python
44

5+
cache: pip
56
sudo: false
67

78
env:
@@ -22,6 +23,9 @@ env:
2223

2324
- TOX_ENV=py27-django1.10-drf3.4
2425
- TOX_ENV=py27-django1.10-drf3.5
26+
27+
- TOX_ENV=py27-django1.11-drf3.4
28+
- TOX_ENV=py27-django1.11-drf3.5
2529

2630
- TOX_ENV=py33-django1.8-drf3.1
2731
- TOX_ENV=py33-django1.8-drf3.2
@@ -43,9 +47,15 @@ env:
4347

4448
- TOX_ENV=py34-django1.10-drf3.4
4549
- TOX_ENV=py34-django1.10-drf3.5
50+
51+
- TOX_ENV=py34-django1.11-drf3.4
52+
- TOX_ENV=py34-django1.11-drf3.5
4653

4754
- TOX_ENV=py35-django1.10-drf3.4
4855
- TOX_ENV=py35-django1.10-drf3.5
56+
57+
- TOX_ENV=py35-django1.11-drf3.4
58+
- TOX_ENV=py35-django1.11-drf3.5
4959

5060
matrix:
5161
fast_finish: true

README.rst

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

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

2929
Installation

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}-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}
55

66
[testenv]
77
commands = ./runtests.py --fast {posargs} --verbose
@@ -11,6 +11,7 @@ deps =
1111
django1.8: Django<1.9
1212
django1.9: Django<1.10
1313
django1.10: Django<1.11
14+
django1.11: Django<1.12
1415
drf3.1: djangorestframework<3.2
1516
drf3.2: djangorestframework<3.3
1617
drf3.3: djangorestframework<3.4

0 commit comments

Comments
 (0)