From 5f3e3d7950ec98f42b6d37b0be36fda4646741dc Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 19 Nov 2017 21:59:07 +0100 Subject: [PATCH] Added DRF 3.7 support. --- .travis.yml | 16 ++++++++++++++++ README.rst | 2 +- tox.ini | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b48b7a31..5977df33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,8 @@ matrix: env: TOXENV=py27-dj110-drf35-codecov - python: 2.7 env: TOXENV=py27-dj110-drf36-codecov + - python: 2.7 + env: TOXENV=py27-dj110-drf37-codecov - python: 2.7 env: TOXENV=py27-dj111-drf34-codecov @@ -49,6 +51,8 @@ matrix: env: TOXENV=py27-dj111-drf35-codecov - python: 2.7 env: TOXENV=py27-dj111-drf36-codecov + - python: 2.7 + env: TOXENV=py27-dj111-drf37-codecov - python: 3.3 env: TOXENV=py33-dj18-drf31-codecov @@ -95,6 +99,8 @@ matrix: env: TOXENV=py34-dj110-drf35-codecov - python: 3.4 env: TOXENV=py34-dj110-drf36-codecov + - python: 3.4 + env: TOXENV=py34-dj110-drf37-codecov - python: 3.4 env: TOXENV=py34-dj111-drf34-codecov @@ -102,6 +108,8 @@ matrix: env: TOXENV=py34-dj111-drf35-codecov - python: 3.4 env: TOXENV=py34-dj111-drf36-codecov + - python: 3.4 + env: TOXENV=py34-dj111-drf37-codecov - python: 3.5 env: TOXENV=py35-dj110-drf34-codecov @@ -109,6 +117,8 @@ matrix: env: TOXENV=py35-dj110-drf35-codecov - python: 3.5 env: TOXENV=py35-dj110-drf36-codecov + - python: 3.5 + env: TOXENV=py35-dj110-drf37-codecov - python: 3.5 env: TOXENV=py35-dj111-drf34-codecov @@ -116,6 +126,8 @@ matrix: env: TOXENV=py35-dj111-drf35-codecov - python: 3.5 env: TOXENV=py35-dj111-drf36-codecov + - python: 3.5 + env: TOXENV=py35-dj111-drf37-codecov - python: 3.6 env: TOXENV=py36-dj110-drf34-codecov @@ -123,6 +135,8 @@ matrix: env: TOXENV=py36-dj110-drf35-codecov - python: 3.6 env: TOXENV=py36-dj110-drf36-codecov + - python: 3.6 + env: TOXENV=py36-dj110-drf37-codecov - python: 3.6 env: TOXENV=py36-dj111-drf34-codecov @@ -130,6 +144,8 @@ matrix: env: TOXENV=py36-dj111-drf35-codecov - python: 3.6 env: TOXENV=py36-dj111-drf36-codecov + - python: 3.6 + env: TOXENV=py36-dj111-drf37-codecov install: - pip install tox diff --git a/README.rst b/README.rst index 627f71cf..afb30608 100644 --- a/README.rst +++ b/README.rst @@ -24,7 +24,7 @@ Requirements - Python (2.7, 3.3, 3.4, 3.5, 3.6) - Django (1.8, 1.9, 1.10, 1.11) -- Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6) +- Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7) Installation ------------ diff --git a/tox.ini b/tox.ini index ac54a1b6..6f4952a6 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = py27-{flake8,docs}, {py27,py33,py34,py35,py36}-dj{18,19,110,111}-drf{31,32,33,34,35,36} + {py27,py34,py35,py36}-dj{110,111}-drf37 [testenv] commands = @@ -21,6 +22,7 @@ deps = drf34: djangorestframework<3.5 drf35: djangorestframework<3.6 drf36: djangorestframework<3.7 + drf37: djangorestframework<3.8 py27-dj{18,19}-drf{31,32,33,34}: djangorestframework-oauth==1.0.1 -rrequirements/testing.txt coverage: coverage