encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-23 23:12:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2786 from maryokhin/patch-2

Browse Source 
Update tox & Travis with Django 1.8 release
This commit is contained in:
Xavier Ordoquy 2015-04-02 11:17:16 +02:00
commit 73e46d9a7f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -5,6 +5,10 @@ sudo: false
env: env:
- TOX_ENV=py27-flake8 - TOX_ENV=py27-flake8
- TOX_ENV=py27-docs - TOX_ENV=py27-docs
- TOX_ENV=py34-django18
- TOX_ENV=py33-django18
- TOX_ENV=py32-django18
- TOX_ENV=py27-django18
- TOX_ENV=py34-django17 - TOX_ENV=py34-django17
- TOX_ENV=py33-django17 - TOX_ENV=py33-django17
- TOX_ENV=py32-django17 - TOX_ENV=py32-django17
@ -21,10 +25,7 @@ env:
- TOX_ENV=py26-django15 - TOX_ENV=py26-django15
- TOX_ENV=py27-django14 - TOX_ENV=py27-django14
- TOX_ENV=py26-django14 - TOX_ENV=py26-django14
- TOX_ENV=py34-django18beta
- TOX_ENV=py33-django18beta
- TOX_ENV=py32-django18beta
- TOX_ENV=py27-django18beta
install: install:
- pip install tox - pip install tox

4
tox.ini
View File

@ -3,7 +3,7 @@ envlist =
py27-{flake8,docs}, py27-{flake8,docs},
{py26,py27}-django14, {py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16}, {py26,py27,py32,py33,py34}-django{15,16},
{py27,py32,py33,py34}-django{17,18beta} {py27,py32,py33,py34}-django{17,18}
[testenv] [testenv]
commands = ./runtests.py --fast commands = ./runtests.py --fast
@ -14,7 +14,7 @@ deps =
django15: Django==1.5.6 # Should track minimum supported django15: Django==1.5.6 # Should track minimum supported
django16: Django==1.6.3 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported
django17: Django==1.7.2 # Should track maximum supported django17: Django==1.7.2 # Should track maximum supported
django18beta: https://www.djangoproject.com/download/1.8b1/tarball/ django18: Django==1.8 # Should track maximum supported
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt -rrequirements/requirements-optionals.txt