Update travis configuration

.travis.yml

@@ -1,32 +1,32 @@
-# Config file for automatic testing at travis-ci.org
+  # Config file for automatic testing at travis-ci.org
 
-language: python
+  language: python
 
-python:
+  python:
     - 3.3
     - 3.4
     - 2.7
     - 2.6
 
-env:
+  env:
     matrix:
     - DJANGO='django16'
     - DJANGO='django17'
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install:
+  # 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"
+  # command to run tests, e.g. python setup.py test
+  script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO"
 
-after_success: coveralls
+  after_success: coveralls
 
-matrix:
+  matrix:
     exclude:
       - python: 2.6
         env: DJANGO='django17'

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