Skip to content

add tests for DRF 3.10 #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sliverc merged 7 commits into from
Aug 9, 2019
Merged

add tests for DRF 3.10 #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6f679a
add tests for DRF 3.10.2+
n2ygk Aug 9, 2019
1b58916
documentation
n2ygk Aug 9, 2019
d3750f9
Merge branch 'master' into drf310
n2ygk Aug 9, 2019
0053a07
missing allow_failures for drfmaster
n2ygk Aug 9, 2019
d282250
forgot CHANGELOG
n2ygk Aug 9, 2019
c474e6d
Use official spelling of DRF
sliverc Aug 9, 2019
b680bda
Change order as of keep a changelog
sliverc Aug 9, 2019
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
24 changes: 24 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ cache: pip
# Favor explicit over implicit and use an explicit build matrix.
matrix:
allow_failures:
- env: TOXENV=py35-django111-drfmaster
- env: TOXENV=py36-django111-drfmaster
- env: TOXENV=py35-django21-drfmaster
- env: TOXENV=py36-django21-drfmaster
- env: TOXENV=py37-django21-drfmaster
Expand All @@ -17,30 +19,44 @@ matrix:

- python: 3.5
env: TOXENV=py35-django111-drf39
- python: 3.5
env: TOXENV=py35-django111-drf310
- python: 3.5
env: TOXENV=py35-django111-drfmaster
- python: 3.5
env: TOXENV=py35-django21-drf39
- python: 3.5
env: TOXENV=py35-django21-drf310
- python: 3.5
env: TOXENV=py35-django21-drfmaster
- python: 3.5
dist: xenial
env: TOXENV=py35-django22-drf39
- python: 3.5
dist: xenial
env: TOXENV=py35-django22-drf310
- python: 3.5
dist: xenial
env: TOXENV=py35-django22-drfmaster

- python: 3.6
env: TOXENV=py36-django111-drf39
- python: 3.6
env: TOXENV=py36-django111-drf310
- python: 3.6
env: TOXENV=py36-django111-drfmaster
- python: 3.6
env: TOXENV=py36-django21-drf39
- python: 3.6
env: TOXENV=py36-django21-drf310
- python: 3.6
env: TOXENV=py36-django21-drfmaster
- python: 3.6
dist: xenial
env: TOXENV=py36-django22-drf39
- python: 3.6
dist: xenial
env: TOXENV=py36-django22-drf310
- python: 3.6
dist: xenial
env: TOXENV=py36-django22-drfmaster
Expand All @@ -49,6 +65,10 @@ matrix:
dist: xenial
sudo: required
env: TOXENV=py37-django21-drf39
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-django21-drf310
- python: 3.7
dist: xenial
sudo: required
Expand All @@ -57,6 +77,10 @@ matrix:
dist: xenial
sudo: required
env: TOXENV=py37-django22-drf39
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-django22-drf310
- python: 3.7
dist: xenial
sudo: required
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ any parts of the framework not mentioned in the documentation should generally b

## [Unreleased]

### Added

* Add support for Django REST framework 3.10.

### Removed

* Removed support for Python 2.7 and 3.4.
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 @@ -89,7 +89,7 @@ Requirements

1. Python (3.5, 3.6, 3.7)
2. Django (1.11, 2.1, 2.2)
3. Django REST Framework (3.9)
3. Django REST Framework (3.9, 3.10)

------------
Installation
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ like the following:

1. Python (3.5, 3.6, 3.7)
2. Django (1.11, 2.1, 2.2)
3. Django REST Framework (3.9)
3. Django REST Framework (3.9, 3.10)

## Installation

Expand Down
5 changes: 3 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[tox]
envlist =
py{35,36}-django111-drf{39,master},
py{35,36,37}-django{21,22}-drf{39,master},
py{35,36}-django111-drf{39,310,master},
py{35,36,37}-django{21,22}-drf{39,310,master},

[testenv]
deps =
django111: Django>=1.11,<1.12
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
drf39: djangorestframework>=3.9.0,<3.10
drf310: djangorestframework>=3.10.2,<3.11
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip

setenv =
Expand Down