diff options
| author | Xavier Ordoquy | 2015-01-19 02:40:15 +0100 |
|---|---|---|
| committer | Xavier Ordoquy | 2015-01-19 02:40:15 +0100 |
| commit | 4f27b966a5954c56a96b298198ec93b69583dfad (patch) | |
| tree | b5cc4b21c0fc8fbc7bb4fc08af1147d1d20886a0 /.travis.yml | |
| parent | 4ce4132e08ba7764f120c71eeebdbaefee281689 (diff) | |
| parent | b5128ca574d03ea590a198b04043142a3fc7163e (diff) | |
| download | django-rest-framework-4f27b966a5954c56a96b298198ec93b69583dfad.tar.bz2 | |
Merge pull request #2427 from DavidMuller/pytest_version_bumps
Preliminary Support For Django 1.8 Alpha
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 8 insertions, 0 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 |