encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5619 from rpkilby/explicit-django20-support

Browse Source 
Update Django 2.0 support
This commit is contained in:
Xavier Ordoquy 2017-11-23 07:12:04 +01:00 committed by GitHub
commit c2c9225782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -29,7 +29,6 @@ matrix:
allow_failures: allow_failures:
- env: DJANGO=master - env: DJANGO=master
- env: DJANGO=2.0
install: install:
- pip install tox tox-travis - pip install tox tox-travis

2
README.md
View File

@ -53,7 +53,7 @@ There is a live example API for testing purposes, [available here][sandbox].
# Requirements # Requirements
* Python (2.7, 3.4, 3.5, 3.6) * Python (2.7, 3.4, 3.5, 3.6)
* Django (1.10, 1.11, 2.0 alpha) * Django (1.10, 1.11, 2.0rc1)
# Installation # Installation

2
tox.ini
View File

@ -24,7 +24,7 @@ setenv =
deps = deps =
django110: Django>=1.10,<1.11 django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0 django111: Django>=1.11,<2.0
django20: Django>=2.0b1,<2.1 django20: Django>=2.0rc1,<2.1
djangomaster: https://github.com/django/django/archive/master.tar.gz djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt -rrequirements/requirements-optionals.txt