encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-18 20:43:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

django 1.10 support initials (#4144)

Browse Source 
* added django 1.10 alpha on tox
* added django 1.10 alpha on travis
* added allow_failure on travis matrix
This commit is contained in:
Asif Saifuddin Auvi 2016-05-26 01:07:21 +06:00 committed by Tom Christie
parent 9d87dbc016
commit 35ace2e9ec
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -16,8 +16,19 @@ env:
- TOX_ENV=py33-django18 - TOX_ENV=py33-django18
- TOX_ENV=py32-django18 - TOX_ENV=py32-django18
- TOX_ENV=py27-django18 - TOX_ENV=py27-django18
- TOX_ENV=py27-django110
- TOX_ENV=py35-django110
- TOX_ENV=py34-django110
matrix: matrix:
allow_failures:
- env: TOX_ENV=py27-django110
- env: TOX_ENV=py34-django110
- env: TOX_ENV=py35-django110
fast_finish: true fast_finish: true
install: install:

2
tox.ini
View File

@ -6,6 +6,7 @@ envlist =
py27-{lint,docs}, py27-{lint,docs},
{py27,py32,py33,py34,py35}-django18, {py27,py32,py33,py34,py35}-django18,
{py27,py34,py35}-django{19} {py27,py34,py35}-django{19}
{py27,py34,py35}-django{110}
[testenv] [testenv]
commands = ./runtests.py --fast {posargs} --coverage -rw commands = ./runtests.py --fast {posargs} --coverage -rw
@ -15,6 +16,7 @@ setenv =
deps = deps =
django18: Django==1.8.13 django18: Django==1.8.13
django19: Django==1.9.6 django19: Django==1.9.6
django110: Django==1.10a1
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt -rrequirements/requirements-optionals.txt