Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Add DRF 3.7 and Django 2.0 to the test matrix. #394

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.

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
mblayman merged 8 commits into django-json-api:master from mblayman:drf-37
Jan 24, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Add DRF 3.7 to the test matrix.
Fixes #388 
  • Loading branch information
mblayman committed Dec 18, 2017
commit ceb81605688e8f4767ffdce50dd6dc51e4773aa1
2 changes: 1 addition & 1 deletion .travis.yml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python:
- "3.5"
- "3.6"
env:
- DJANGO=">=1.11,<1.12" DRF=">=3.6.3,<3.7"
- DJANGO=">=1.11,>=2.0,<2.1" DRF=">=3.6.3,>=3.7.0,<3.8"
before_install:
# Force an upgrade of py & pytest to avoid VersionConflict
- pip install --upgrade py
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
v2.4.0

* Add support for Django REST Framework 3.7.x.
* Add support for Django 2.0.
* Drop support for Django 1.8 - 1.10 (EOL)
* Drop support for Django REST Framework < 3.6.3
(3.6.3 is the first to support Django 1.11)
Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ Requirements
------------

1. Python (2.7, 3.4, 3.5, 3.6)
2. Django (1.11)
3. Django REST Framework (3.6)
2. Django (1.11, 2.0)
3. Django REST Framework (3.6, 3.7)

------------
Installation
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ like the following:
## Requirements

1. Python (2.7, 3.4, 3.5, 3.6)
2. Django (1.11)
3. Django REST Framework (3.6)
2. Django (1.11, 2.0)
3. Django REST Framework (3.6, 3.7)

## Installation

Expand Down
3 changes: 2 additions & 1 deletion tox.ini
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[tox]
envlist =
py{27,34,35,36}-django111-drf{36},
py{27,34,35,36}-django111-drf{36,37},

[testenv]
deps =
django111: Django>=1.11,<1.12
drf36: djangorestframework>=3.6.3,<3.7
drf37: djangorestframework>=3.7.0,<3.8

setenv =
PYTHONPATH = {toxinidir}
Expand Down

AltStyle によって変換されたページ (->オリジナル) /