1 files changed, 33 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml
index 18fe66ab..6191e7e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,41 @@
 language: python
 
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
+sudo: false
 
 env:
-  - DJANGO="django==1.6"
-  - DJANGO="django==1.5.5"
-  - DJANGO="django==1.4.10"
-  - DJANGO="django==1.3.7"
+    - TOX_ENV=py27-flake8
+    - TOX_ENV=py27-docs
+    - TOX_ENV=py34-django17
+    - TOX_ENV=py33-django17
+    - TOX_ENV=py32-django17
+    - TOX_ENV=py27-django17
+    - TOX_ENV=py34-django16
+    - TOX_ENV=py33-django16
+    - TOX_ENV=py32-django16
+    - TOX_ENV=py27-django16
+    - TOX_ENV=py26-django16
+    - TOX_ENV=py34-django15
+    - TOX_ENV=py33-django15
+    - TOX_ENV=py32-django15
+    - TOX_ENV=py27-django15
+    - TOX_ENV=py26-django15
+    - TOX_ENV=py27-django14
+    - TOX_ENV=py26-django14
+    - TOX_ENV=py34-djangomaster
+    - TOX_ENV=py33-djangomaster
+    - TOX_ENV=py32-djangomaster
+    - TOX_ENV=py27-djangomaster
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TOX_ENV=py34-djangomaster
+    - env: TOX_ENV=py33-djangomaster
+    - env: TOX_ENV=py32-djangomaster
+    - env: TOX_ENV=py27-djangomaster
 
 install:
-  - pip install $DJANGO
-  - pip install defusedxml==0.3
-  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi"
-  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.1; fi"
-  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi"
-  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi"
-  - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi"
-  - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6; fi"
-  - export PYTHONPATH=.
+  - pip install tox
 
 script:
-  - python rest_framework/runtests/runtests.py
-
-matrix:
-  exclude:
-    - python: "3.2"
-      env: DJANGO="django==1.4.10"
-    - python: "3.2"
-      env: DJANGO="django==1.3.7"
-    - python: "3.3"
-      env: DJANGO="django==1.4.10"
-    - python: "3.3"
-      env: DJANGO="django==1.3.7"
-
+    - tox -e $TOX_ENV