Merge remote-tracking branch 'origin/release/0.8.x' into develop

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+0.8.4 (2016-06-22)
+++++++++++++++++++
+
+* Fixed issues with cmsplugin-filer 1.1.
+
 0.8.3 (2016-06-21)
 ++++++++++++++++++
 

djangocms_blog/__init__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 __author__ = 'Iacopo Spalletti'
 __email__ = 'i.spalletti@nephila.it'
-
-__version__ = '0.9.pre2'
+__version__ = '0.9.pre3'
     
 default_app_config = 'djangocms_blog.apps.BlogAppConfig'

djangocms_blog/migrations/0001_initial.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
     if 'cmsplugin_filer' not in thumbnail_model:
         filer_dependencies = [
             ('filer', '0003_thumbnailoption'),
-            ('cmsplugin_filer_image', '0006_auto_20160427_1438')
+            ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
         ]
     else:
         filer_dependencies = [

djangocms_blog/migrations/0004_auto_20150108_1435.py

@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
     if 'cmsplugin_filer' not in thumbnail_model:
         filer_dependencies = [
             ('filer', '0003_thumbnailoption'),
-            ('cmsplugin_filer_image', '0006_auto_20160427_1438')
+            ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
         ]
     else:
         filer_dependencies = [

djangocms_blog/migrations/0007_auto_20150719_0933.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
     if 'cmsplugin_filer' not in thumbnail_model:
         filer_dependencies = [
             ('filer', '0003_thumbnailoption'),
-            ('cmsplugin_filer_image', '0006_auto_20160427_1438')
+            ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
         ]
     else:
         filer_dependencies = [

setup.py

@@ -30,7 +30,7 @@ setup(
         'django-parler>=1.5',
         'django-cms>=3.2',
         'django-taggit>=0.12.2',
-        'django-filer>=1.2',
+        'django-filer>=1.1',
         'pytz',
         'django-taggit-templatetags',
         'django-taggit-autosuggest',

tox.ini

@@ -6,8 +6,12 @@ commands = {env:COMMAND:python} cms_helper.py test djangocms_blog
 deps =
     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
     cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
     cms32: djangocms-text-ckeditor<3.0
     cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip
@@ -17,14 +21,6 @@ deps =
     knocker: djangocms-text-ckeditor<3.0
     django-meta>=1.2
     https://github.com/nephila/djangocms-helper/archive/develop.zip
-    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