From 96440f19335ae70a9941ee22bca29865fda4d26a Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Sat, 4 Jul 2015 10:50:04 +0200
Subject: [PATCH] Update test matrix

---
 .travis.yml | 97 +++++++++++++++++++++++++++++++----------------------
 tox.ini     |  5 ++-
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08247f1..4c59281 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,63 @@
-  # 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
+sudo: false
 
-  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
+python:
+  - 3.4
+  - 3.3
+  - 2.7
+  - 2.6
 
+env:
   matrix:
-    exclude:
-      - python: 2.6
-        env: DJANGO='django17'
+  - DJANGO='django16' CMS='cms30'
+  - DJANGO='django16' CMS='cms31'
+  - DJANGO='django16' CMS='cms32'
+  - DJANGO='django17' CMS='cms30'
+  - DJANGO='django17' CMS='cms31'
+  - DJANGO='django17' CMS='cms32'
 
-    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'
+
+# 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-$CMS"
+
+after_success: coveralls
+
+matrix:
+  exclude:
+  - python: 2.6
+    env: DJANGO='django17' CMS='cms30'
+  - python: 2.6
+    env: DJANGO='django17' CMS='cms31'
+  - python: 2.6
+    env: DJANGO='django17' CMS='cms32'
+  - python: 2.6
+    env: DJANGO='django18' CMS='cms31'
+  - python: 2.6
+    env: DJANGO='django18' CMS='cms32'
+
+  allow_failures:
+  - python: 2.6
+    env: DJANGO='django16' CMS='cms32'
+  - python: 2.7
+    env: DJANGO='django16' CMS='cms32'
+  - python: 2.7
+    env: DJANGO='django17' CMS='cms32'
+  - python: 3.3
+    env: DJANGO='django16' CMS='cms32'
+  - python: 3.3
+    env: DJANGO='django17' CMS='cms32'
+  - python: 3.4
+    env: DJANGO='django16' CMS='cms32'
+  - python: 3.4
+    env: DJANGO='django17' CMS='cms32'
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 7fd99ea..148cb72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
-envlist = py{26}-django{16}-cms{30,31},py{27,33,34}-django{16,17,18}-cms{30,31}
+envlist = py{26}-django{16}-cms{30,31,32},py{27,33,34}-django{16,17}-cms{30,31,32}
 
 [testenv]
+commands = {env:COMMAND:python} setup.py test
 deps =
-    html5lib < 0.9999
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     django18: Django>=1.7,<1.9
@@ -12,4 +12,3 @@ deps =
     cms32: https://github.com/divio/django-cms/archive/develop.zip
     py26: unittest2
     -r{toxinidir}/requirements-test.txt
-commands = {env:COMMAND:python} setup.py test