From 3fbb7218dee131dd09e4c43627550745f6cb436a Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Sun, 20 Dec 2015 19:23:42 +0100
Subject: [PATCH] Make django CMS 3.2 tests blocking

---
 .travis.yml | 24 ------------------------
 tox.ini     | 12 +++++-------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44158b3..37941a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,27 +84,3 @@ matrix:
     env: DJANGO='django17' CMS='cms31'
   - python: 3.5
     env: DJANGO='django17' 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: 2.7
-    env: DJANGO='django18' CMS='cms32'
-  - python: 3.3
-    env: DJANGO='django16' CMS='cms32'
-  - python: 3.3
-    env: DJANGO='django17' CMS='cms32'
-  - python: 3.3
-    env: DJANGO='django18' CMS='cms32'
-  - python: 3.4
-    env: DJANGO='django16' CMS='cms32'
-  - python: 3.4
-    env: DJANGO='django17' CMS='cms32'
-  - python: 3.4
-    env: DJANGO='django18' CMS='cms32'
-  - python: 3.5
-    env: DJANGO='django18' CMS='cms32'
diff --git a/tox.ini b/tox.ini
index b96713b..d468c22 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,15 +7,13 @@ deps =
     -r{toxinidir}/requirements-test.txt
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
-    django18: Django>=1.7,<1.9
-    django18: https://github.com/stefanfoulis/django-filer/archive/develop.zip
-    django18: https://github.com/stefanfoulis/cmsplugin-filer/archive/develop.zip
-    django19: Django==1.9a1
-    django19: https://github.com/stefanfoulis/django-filer/archive/develop.zip
-    django19: https://github.com/stefanfoulis/cmsplugin-filer/archive/develop.zip
+    django18: Django>=1.8,<1.9
+    django19: Django>=1.9,<1.10
+    django19: https://github.com/divio/django-filer/archive/develop.zip
+    django19: https://github.com/divio/cmsplugin-filer/archive/develop.zip
     cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip
     cms31: https://github.com/divio/django-cms/archive/support/3.1.x.zip
-    cms32: https://github.com/divio/django-cms/archive/develop.zip
+    cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
     https://github.com/nephila/django-meta-mixin/archive/master.zip
     https://github.com/nephila/djangocms-helper/archive/develop.zip
     py26: unittest2