diff options
| author | Xavier Ordoquy | 2015-04-07 08:22:01 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2015-04-07 08:22:01 +0200 |
| commit | 0c7f36ecd8295114a232f357590618046685b218 (patch) | |
| tree | b76ef2e90d69724e97d4abae984307482c9cb179 | |
| parent | 2e6d39dbae3330cef31d68dedd37398e364ee83c (diff) | |
| parent | 9844f652a9985a1cafa712c708c62efda0c3f583 (diff) | |
| download | django-rest-framework-0c7f36ecd8295114a232f357590618046685b218.tar.bz2 | |
Merge pull request #2795 from jpadilla/test-djangomaster
Test against Django's master branch
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | tox.ini | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 71cec7be..2134a144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,18 @@ env: - TOX_ENV=py26-django15 - TOX_ENV=py27-django14 - TOX_ENV=py26-django14 + - TOX_ENV=py27-djangomaster + - TOX_ENV=py32-djangomaster + - TOX_ENV=py33-djangomaster + - TOX_ENV=py34-djangomaster +matrix: + fast_finish: true + allow_failures: + - env: TOX_ENV=py27-djangomaster + - env: TOX_ENV=py32-djangomaster + - env: TOX_ENV=py33-djangomaster + - env: TOX_ENV=py34-djangomaster install: - pip install tox @@ -3,7 +3,7 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,18} + {py27,py32,py33,py34}-django{17,18,master} [testenv] commands = ./runtests.py --fast @@ -15,6 +15,7 @@ deps = django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported django18: Django==1.8 # Should track maximum supported + djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt |