From 8a0fcf87c6b811b3c4bf9b50e710ce46213c67ce Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Sun, 28 Jun 2015 17:36:02 +0200
Subject: [PATCH] Update travis configuration

---
 .travis.yml           | 82 +++++++++++++++++++++----------------------
 requirements-test.txt |  2 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8cfccdb..08247f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,46 @@
-# Config file for automatic testing at travis-ci.org
+  # Config file for automatic testing at travis-ci.org
 
-language: python
+  language: python
 
-python:
-  - 3.3
-  - 3.4
-  - 2.7
-  - 2.6
+  python:
+    - 3.3
+    - 3.4
+    - 2.7
+    - 2.6
+
+  env:
+    matrix:
+    - DJANGO='django16'
+    - DJANGO='django17'
+
+  # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+  install:
+    - pip install -U tox>=1.8 coveralls
+    - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
+    - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
+    - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
+    - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
+
+  # command to run tests, e.g. python setup.py test
+  script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO"
+
+  after_success: coveralls
 
-env:
   matrix:
-  - DJANGO='django16'
-  - DJANGO='django17'
+    exclude:
+      - python: 2.6
+        env: DJANGO='django17'
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install:
-  - pip install -U tox>=1.8 coveralls
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
-
-# command to run tests, e.g. python setup.py test
-script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO"
-
-after_success: coveralls
-
-matrix:
-  exclude:
-    - python: 2.6
-      env: DJANGO='django17'
-
-  allow_failures:
-    - python: 3.3
-      env: DJANGO='django15'
-    - python: 3.3
-      env: DJANGO='django16'
-    - python: 3.3
-      env: DJANGO='django17'
-    - python: 3.4
-      env: DJANGO='django15'
-    - python: 3.4
-      env: DJANGO='django16'
-    - python: 3.4
-      env: DJANGO='django17'
+    allow_failures:
+      - python: 3.3
+        env: DJANGO='django15'
+      - python: 3.3
+        env: DJANGO='django16'
+      - python: 3.3
+        env: DJANGO='django17'
+      - python: 3.4
+        env: DJANGO='django15'
+      - python: 3.4
+        env: DJANGO='django16'
+      - python: 3.4
+        env: DJANGO='django17'
diff --git a/requirements-test.txt b/requirements-test.txt
index 87bbd05..ef1af62 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -6,4 +6,4 @@ nose>=1.3.0
 django-nose>=1.2
 flake8
 djangocms-helper>=0.7
-tox>=1.8
+tox>=2.0