From 9c025205732662388991179389b462ca4d68a810 Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Sat, 11 Oct 2014 09:15:11 +0200
Subject: [PATCH] Switch to tox 1.8 and add Django 1.7 to travis matrix

---
 .travis.yml           | 10 ++++++++++
 requirements-test.txt |  3 ++-
 tox.ini               | 35 ++++++++---------------------------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4aed30a..56c926b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ env:
   matrix:
   - DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
   - DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
+  - DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
@@ -24,13 +25,22 @@ script: djangocms-helper djangocms_blog test --cms --nose-runner
 after_success: coveralls
 
 matrix:
+  exclude:
+    - python: 2.6
+      env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
 
   allow_failures:
+    - python: 2.7
+      env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
     - python: 3.3
       env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
     - python: 3.3
       env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
+    - python: 3.3
+      end: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
     - python: 3.4
       env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
     - python: 3.4
       env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
+    - python: 3.4
+      env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
\ No newline at end of file
diff --git a/requirements-test.txt b/requirements-test.txt
index 6da9937..5b69acc 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -5,4 +5,5 @@ mock>=1.0.1
 nose>=1.3.0
 django-nose>=1.2
 flake8
-djangocms-helper>=0.4
\ No newline at end of file
+djangocms-helper>=0.4
+tox>=1.8
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 8fe6c8f..d80a8d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,32 +1,13 @@
 [tox]
-envlist = py26dj15, py26dj16, py27dj15, py27dj16
+envlist = {py26,py27}-django{15,16}
 
 [testenv]
-commands = djangocms-helper djangocms_blog test --cms --nose
+basepython =
+    py26: python2.6
+    py27: python2.7
 deps =
+    django15: Django>=1.5,<1.6
+    django16: Django>=1.6,<1.7
+    py26: unittest2
     -r{toxinidir}/requirements-test.txt
-
-[testenv:py26dj15]
-basepython=python2.6
-deps =
-    django<1.6
-    {[testenv]deps}
-
-[testenv:py26dj16]
-basepython=python2.6
-deps =
-    django<1.7
-    {[testenv]deps}
-
-[testenv:py27dj15]
-basepython=python2.7
-deps =
-    django<1.6
-    {[testenv]deps}
-
-[testenv:py27dj16]
-basepython=python2.7
-deps =
-    django<1.7
-    {[testenv]deps}
-
+commands = djangocms-helper djangocms_blog test --cms --nose