Merge pull request #348 from nephila/hotfix/aldryn-apphooks-config-0.3.1

Fix aldryn apphooks config 0.3.1

djangocms_blog/migrations/0022_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', '0021_auto_20160823_2008'),
+    ]
+
+    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

@@ -5,6 +5,7 @@ envlist = pep8,isort,py{35,34,27}-django{19}-{cms34,cms33,cms32,knocker},py{35,3
 commands = {env:COMMAND:python} cms_helper.py test djangocms_blog
 deps =
     py26: unittest2
+    py26: Pillow<4.0
     django16: Django>=1.6,<1.7
     django16: django-taggit<0.18
     django16: django-mptt<0.8
@@ -18,6 +19,7 @@ deps =
     django17: cmsplugin-filer<1.2
     django17: django-haystack
     django17: djangocms-admin-style<1.2
+    django17: django-taggit<0.18
     django18: Django>=1.8,<1.9
     django18: django-mptt>=0.8
     django18: django-filer<1.3
@@ -46,7 +48,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