diff options
| author | David Muller | 2015-01-18 15:04:50 -0800 |
|---|---|---|
| committer | David Muller | 2015-01-18 15:04:50 -0800 |
| commit | a82a4d0a099eea74832ce3d8de376e4dbeb4b266 (patch) | |
| tree | 4a4f6e35738554d5cf860ccdc26e84e6a978dc85 | |
| parent | 1421b057f7ccf496c0e65e89aa3882d614aa7030 (diff) | |
| download | django-rest-framework-a82a4d0a099eea74832ce3d8de376e4dbeb4b266.tar.bz2 | |
Add Django 1.8 alpha to test matrix
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | tox.ini | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6191e7e2..996c3ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,10 @@ env: - TOX_ENV=py26-django15 - TOX_ENV=py27-django14 - TOX_ENV=py26-django14 + - TOX_ENV=py34-django18alpha + - TOX_ENV=py33-django18alpha + - TOX_ENV=py32-django18alpha + - TOX_ENV=py27-django18alpha - TOX_ENV=py34-djangomaster - TOX_ENV=py33-djangomaster - TOX_ENV=py32-djangomaster @@ -29,6 +33,10 @@ env: matrix: fast_finish: true allow_failures: + - env: TOX_ENV=py34-django18alpha + - env: TOX_ENV=py33-django18alpha + - env: TOX_ENV=py32-django18alpha + - env: TOX_ENV=py27-django18alpha - env: TOX_ENV=py34-djangomaster - env: TOX_ENV=py33-djangomaster - env: TOX_ENV=py32-djangomaster @@ -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,master} + {py27,py32,py33,py34}-django{17,18alpha,master} [testenv] commands = ./runtests.py --fast @@ -14,6 +14,7 @@ deps = django15: Django==1.5.6 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported + django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/ djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 |