aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorTymur Maryokhin2014-11-25 10:58:03 +0100
committerTymur Maryokhin2014-11-25 10:58:03 +0100
commit1fcb495456bebf56b820c89951af285a45383d6f (patch)
tree768dfa820dcbdb75624e29a7a6ad5e4010c42f5b /.travis.yml
parent585054f0120b9c73c8158a92466f8959ff7f932e (diff)
downloaddjango-rest-framework-1fcb495456bebf56b820c89951af285a45383d6f.tar.bz2
Updated travis config
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml50
1 files changed, 24 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 9b2e4738..e19efdba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,38 @@
language: python
-python: 2.7
-
sudo: false
env:
- - TOX_ENV=flake8
- - TOX_ENV=py3.4-django1.7
- - TOX_ENV=py3.3-django1.7
- - TOX_ENV=py3.2-django1.7
- - TOX_ENV=py2.7-django1.7
- - TOX_ENV=py3.4-django1.6
- - TOX_ENV=py3.3-django1.6
- - TOX_ENV=py3.2-django1.6
- - TOX_ENV=py2.7-django1.6
- - TOX_ENV=py2.6-django1.6
- - TOX_ENV=py3.4-django1.5
- - TOX_ENV=py3.3-django1.5
- - TOX_ENV=py3.2-django1.5
- - TOX_ENV=py2.7-django1.5
- - TOX_ENV=py2.6-django1.5
- - TOX_ENV=py2.7-django1.4
- - TOX_ENV=py2.6-django1.4
- - TOX_ENV=py3.4-djangomaster
- - TOX_ENV=py3.3-djangomaster
- - TOX_ENV=py2.7-djangomaster
+ - TOX_ENV=py27-flake8
+ - TOX_ENV=py34-django1.7
+ - TOX_ENV=py33-django1.7
+ - TOX_ENV=py32-django1.7
+ - TOX_ENV=py27-django1.7
+ - TOX_ENV=py34-django1.6
+ - TOX_ENV=py33-django1.6
+ - TOX_ENV=py32-django1.6
+ - TOX_ENV=py27-django1.6
+ - TOX_ENV=py26-django1.6
+ - TOX_ENV=py34-django1.5
+ - TOX_ENV=py33-django1.5
+ - TOX_ENV=py32-django1.5
+ - TOX_ENV=py27-django1.5
+ - TOX_ENV=py26-django1.5
+ - TOX_ENV=py27-django1.4
+ - TOX_ENV=py26-django1.4
+ - TOX_ENV=py34-djangomaster
+ - TOX_ENV=py33-djangomaster
+ - TOX_ENV=py27-djangomaster
matrix:
fast_finish: true
allow_failures:
- - env: TOX_ENV=py3.4-djangomaster
- - env: TOX_ENV=py3.3-djangomaster
- - env: TOX_ENV=py2.7-djangomaster
+ - env: TOX_ENV=py34-djangomaster
+ - env: TOX_ENV=py33-djangomaster
+ - env: TOX_ENV=py27-djangomaster
install:
- - "pip install tox --download-cache $HOME/.pip-cache"
+ - pip install tox
script:
- tox -e $TOX_ENV