Merge pull request #430 from nephila/feature/django111

Django 1.11 support

.travis.yml

@@ -15,6 +15,8 @@ env:
   - TOXENV='pep8'
   - TOXENV='isort'
   - TOXENV='docs'
+  - DJANGO='django111' CMS='cms35'
+  - DJANGO='django111' CMS='cms34'
   - DJANGO='django110' CMS='cms35'
   - DJANGO='django110' CMS='cms34'
   - DJANGO='django19' CMS='cms35'
@@ -64,6 +66,10 @@ matrix:
     env: TOXENV='pep8'
   - python: 3.5
     env: TOXENV='isort'
+  - python: 2.7
+    env: DJANGO='django110' CMS='cms35'
+  - python: 2.7
+    env: DJANGO='django110' CMS='cms34'
   - python: 2.7
     env: DJANGO='django19' CMS='cms35'
   - python: 2.7
@@ -72,6 +78,10 @@ matrix:
     env: DJANGO='django19' CMS='cms33'
   - python: 2.7
     env: DJANGO='django19' CMS='cms32'
+  - python: 3.5
+    env: DJANGO='django110' CMS='cms35'
+  - python: 3.5
+    env: DJANGO='django110' CMS='cms34'
   - python: 3.5
     env: DJANGO='django19' CMS='cms35'
   - python: 3.5
@@ -80,6 +90,10 @@ matrix:
     env: DJANGO='django19' CMS='cms33'
   - python: 3.5
     env: DJANGO='django19' CMS='cms32'
+  - python: 3.4
+    env: DJANGO='django110' CMS='cms35'
+  - python: 3.4
+    env: DJANGO='django110' CMS='cms34'
   - python: 3.4
     env: DJANGO='django19' CMS='cms35'
   - python: 3.4

HISTORY.rst

@@ -8,6 +8,8 @@ History
 0.9.1 (unreleased)
 ******************
 
+* Added Django 1.11 support
+
 ******************
 0.9.0 (2018-02-20)
 ******************

README.rst

@@ -11,6 +11,7 @@ Supported Django versions:
 * Django 1.8
 * Django 1.9
 * Django 1.10
+* Django 1.11
 
 Supported django CMS versions:
 

djangocms_blog/__init__.py

@@ -3,6 +3,6 @@
 
 __author__ = 'Iacopo Spalletti'
 __email__ = '[email protected]'
-__version__ = '0.9.0'
+__version__ = '1.0.0.dev1'
 
 default_app_config = 'djangocms_blog.apps.BlogAppConfig'

tox.ini

@@ -18,13 +18,18 @@ deps =
     django110: Django>=1.10,<1.11
     django110: django-mptt>=0.8
     django110: https://github.com/divio/django-filer/archive/develop.zip
+    django111: Django>=1.10,<1.11
+    django111: django-mptt>=0.8
+    django111: https://github.com/divio/django-filer/archive/develop.zip
+    django111: django-appdata>=0.2.0
+    django111: https://github.com/aldryn/aldryn-apphooks-config/archive/feature/django11.zip
     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
     cms33: djangocms-text-ckeditor>=3.0
     cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
     cms34: djangocms-text-ckeditor>=3.2
-    cms35: https://github.com/divio/django-cms/archive/develop.zip
+    cms35: https://github.com/divio/django-cms/archive/release/3.5.x.zip
     cms35: djangocms-text-ckeditor>=3.5
     channels<2.0
     https://github.com/nephila/django-knocker/archive/master.zip?0.1.1