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

Added DRF 3.7 support. #397

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added DRF 3.7 support. #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ 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
- python: 2.7
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
Expand Down Expand Up @@ -95,41 +99,53 @@ 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
- python: 3.4
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
- python: 3.5
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
- python: 3.5
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
- python: 3.6
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
- python: 3.6
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
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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
Expand Down