Merge branch 'merge/0.8.11' into develop

HISTORY.rst

@@ -22,6 +22,12 @@ History
 * Improved admin filtering.
 * Added featured date to post.
 
+*******************
+0.8.11 (2017-03-04)
+*******************
+
+* Fixed support for aldryn-apphooks-config 0.3.1
+
 *******************
 0.8.10 (2017-01-02)
 *******************

djangocms_blog/migrations/0028_auto_20170304_1040.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2017-03-04 09:40
+from __future__ import unicode_literals
+
+from distutils.version import LooseVersion
+
+from django.db import migrations, models
+
+import aldryn_apphooks_config
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('djangocms_blog', '0027_post_date_featured'),
+    ]
+
+    if LooseVersion(aldryn_apphooks_config.__version__) > LooseVersion('0.3.0'):
+        operations = [
+            migrations.AlterField(
+                model_name='blogconfig',
+                name='namespace',
+                field=models.CharField(default=None, max_length=100, unique=True, verbose_name='Instance namespace'),
+            ),
+            migrations.AlterField(
+                model_name='blogconfig',
+                name='type',
+                field=models.CharField(max_length=100, verbose_name='Type'),
+            ),
+        ]

tox.ini

@@ -28,7 +28,7 @@ deps =
     django-meta>=1.2
     html5lib<0.99999999
     https://github.com/nephila/djangocms-helper/archive/release/0.9.x.zip
-    https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip
+    aldryn-apphooks-config
     https://github.com/nephila/djangocms-apphook-setup/archive/master.zip
     -r{toxinidir}/requirements-test.txt