From 0fc168e1473b19bd92876f6597ba464f496a653d Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Wed, 22 Jun 2016 08:10:38 +0200
Subject: [PATCH] Fix filer versions in tox

---
 setup.py |  2 +-
 tox.ini  | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/setup.py b/setup.py
index bdd9b07..1d7fdc9 100755
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ setup(
         'django-parler>=1.5',
         'django-cms>3.0.11',
         'django-taggit>=0.12.2',
-        'django-filer>=1.2',
+        'django-filer>=1.1',
         'pytz',
         'django-taggit-templatetags',
         'django-taggit-autosuggest',
diff --git a/tox.ini b/tox.ini
index 0828e1e..e902791 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,24 @@ envlist = pep8,isort,py{35,34,27}-django{19}-{cms33,cms32,knocker},py{35,34,33,2
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py test djangocms_blog
 deps =
+    py26: unittest2
     django16: Django>=1.6,<1.7
     django16: django-taggit<0.18
     django16: django-mptt<0.8
+    django16: django-filer<1.2
+    django16: cmsplugin-filer<1.1
     django17: Django>=1.7,<1.8
     django17: django-mptt<0.8
+    django17: django-filer<1.3
+    django17: cmsplugin-filer<1.2
     django18: Django>=1.8,<1.9
     django18: django-mptt>=0.8
+    django18: django-filer<1.3
+    django18: cmsplugin-filer<1.2
     django19: Django>=1.9,<1.10
     django19: django-mptt>=0.8
+    django19: django-filer<1.3
+    django19: cmsplugin-filer<1.2
     cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip
     cms30: djangocms-text-ckeditor<2.8
     cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip
@@ -26,17 +35,6 @@ deps =
     knocker: djangocms-text-ckeditor<3.0
     django-meta>=1.2
     https://github.com/nephila/djangocms-helper/archive/develop.zip
-    py26: unittest2
-    py26: django-filer<1.2
-    py26: cmsplugin-filer<1.1
-    py27: django-filer<1.3
-    py27: cmsplugin-filer<1.2
-    py33: django-filer<1.3
-    py33: cmsplugin-filer<1.2
-    py34: django-filer<1.3
-    py34: cmsplugin-filer<1.2
-    py35: django-filer<1.3
-    py35: cmsplugin-filer<1.2
     https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip
     https://github.com/nephila/djangocms-apphook-setup/archive/master.zip
     -r{toxinidir}/requirements-test.txt