Dropped django CMS 3.2 & 3.3 support (#190)

.travis.yml

@@ -30,27 +30,22 @@ env:
     - TOXENV=py27-dj110-cms35
     - TOXENV=py27-dj110-cms34
 
+    - TOXENV=py35-dj19-cms35
     - TOXENV=py35-dj19-cms34
-    - TOXENV=py35-dj19-cms33
-    - TOXENV=py35-dj19-cms32
+    - TOXENV=py34-dj19-cms35
     - TOXENV=py34-dj19-cms34
-    - TOXENV=py34-dj19-cms33
-    - TOXENV=py34-dj19-cms32
+    - TOXENV=py27-dj19-cms35
     - TOXENV=py27-dj19-cms34
-    - TOXENV=py27-dj19-cms33
-    - TOXENV=py27-dj19-cms32
-    # - TOXENV=py35-dj19-cms33-fe FE=1
 
+    - TOXENV=py35-dj18-cms35
     - TOXENV=py35-dj18-cms34
-    - TOXENV=py35-dj18-cms33
-    - TOXENV=py35-dj18-cms32
+    - TOXENV=py34-dj18-cms35
     - TOXENV=py34-dj18-cms34
-    - TOXENV=py34-dj18-cms33
-    - TOXENV=py34-dj18-cms32
+    - TOXENV=py27-dj18-cms35
     - TOXENV=py27-dj18-cms34
-    - TOXENV=py27-dj18-cms33
-    - TOXENV=py27-dj18-cms32
-    # - TOXENV=py27-dj18-cms33-fe FE=1
+
+    # - TOXENV=py35-dj111-cms35-fe FE=1
+    # - TOXENV=py27-dj111-cms35-fe FE=1
 
 cache:
   directories:

aldryn_faq/cms_apps.py

@@ -14,10 +14,9 @@ class FaqApp(CMSConfigApp):
     name = _('FAQ')
     app_name = 'aldryn_faq'
     app_config = FaqConfig
-    urls = ['aldryn_faq.urls']  # COMPAT: CMS3.2
 
     def get_urls(self, *args, **kwargs):
-        return self.urls
+        return ['aldryn_faq.urls']
 
 
 apphook_pool.register(FaqApp)

aldryn_faq/migrations/0015_auto_20180329_1324.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-03-29 11:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import sortedm2m.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aldryn_faq', '0014_auto_20160821_1239'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='faqconfig',
+            name='namespace',
+            field=models.CharField(default=None, max_length=100, unique=True, verbose_name='Instance namespace'),
+        ),
+        migrations.AlterField(
+            model_name='faqconfig',
+            name='type',
+            field=models.CharField(max_length=100, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='latestquestionsplugin',
+            name='cache_duration',
+            field=models.PositiveSmallIntegerField(default=0, help_text="The maximum duration (in seconds) that this plugin's content should be cached.", verbose_name='cache duration'),
+        ),
+        migrations.AlterField(
+            model_name='latestquestionsplugin',
+            name='questions',
+            field=models.IntegerField(default=5, help_text='The number of questions to be displayed.', verbose_name='count'),
+        ),
+        migrations.AlterField(
+            model_name='mostreadquestionsplugin',
+            name='cache_duration',
+            field=models.PositiveSmallIntegerField(default=0, help_text="The maximum duration (in seconds) that this plugin's content should be cached.", verbose_name='cache duration'),
+        ),
+        migrations.AlterField(
+            model_name='mostreadquestionsplugin',
+            name='questions',
+            field=models.IntegerField(default=5, help_text='The number of questions to be displayed.', verbose_name='count'),
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='category',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='aldryn_faq.Category', verbose_name='Title'),
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='is_top',
+            field=models.BooleanField(default=False, verbose_name='is top'),
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='number_of_visits',
+            field=models.PositiveIntegerField(default=0, editable=False, verbose_name='number of visits'),
+        ),
+        migrations.AlterField(
+            model_name='questionlistplugin',
+            name='questions',
+            field=sortedm2m.fields.SortedManyToManyField(help_text=None, to='aldryn_faq.Question', verbose_name='questions'),
+        ),
+        migrations.AlterField(
+            model_name='topquestionsplugin',
+            name='cache_duration',
+            field=models.PositiveSmallIntegerField(default=0, help_text="The maximum duration (in seconds) that this plugin's content should be cached.", verbose_name='cache duration'),
+        ),
+        migrations.AlterField(
+            model_name='topquestionsplugin',
+            name='questions',
+            field=models.IntegerField(default=5, help_text='The number of questions to be displayed.', verbose_name='count'),
+        ),
+    ]

aldryn_faq/tests/test_menu.py

@@ -2,7 +2,7 @@
 
 from __future__ import unicode_literals
 
-from aldryn_faq.menu import FaqCategoryMenu
+from aldryn_faq.cms_menus import FaqCategoryMenu
 from menus.menu_pool import menu_pool
 
 from .test_base import AldrynFaqTest

docs/how_to/install.rst

@@ -30,7 +30,7 @@ Manual Installation
 Requirements
 ============
 
-- This project requires **django CMS 3.2** or later.
+- This project requires **django CMS 3.4** or later.
 
 
 PIP dependency

setup.py

@@ -3,16 +3,16 @@
 from aldryn_faq import __version__
 
 REQUIREMENTS = [
-    'aldryn-apphooks-config>=0.2.4',
+    'aldryn-apphooks-config>=0.4.0',
     'aldryn-boilerplates>=0.7.4,<0.8',
     'aldryn-search',
     'aldryn-translation-tools>=0.2.1',
     'django>=1.8,<2.0',
     'django-admin-sortable2>=0.5.2',
-    'django-cms>=3.2',
+    'django-cms>=3.4',
     'djangocms-text-ckeditor',
     'django-parler>=1.4,<1.7',
-    'django-sortedm2m>=1.2.2',
+    'django-sortedm2m>=1.4.0',
     'django-admin-sortable',
     'django-taggit',
 ]
@@ -25,6 +25,7 @@
     'Framework :: Django :: 1.8',
     'Framework :: Django :: 1.9',
     'Framework :: Django :: 1.10',
+    'Framework :: Django :: 1.11',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: BSD License',
     'Operating System :: OS Independent',

test_requirements/base.txt

@@ -1,5 +1,5 @@
 aldryn-boilerplates>=0.6.0
-aldryn-translation-tools>=0.1.0
+aldryn-translation-tools>=0.2.1
 coverage==3.7.1
 django-classy-tags
 django-parler>=1.4,<1.6.3

tox.ini

@@ -2,8 +2,7 @@
 toxworkdir = {homedir}/.toxenvs/aldryn-faq
 envlist =
     flake8
-    py{36,35,34,27}-dj{19,18}-cms{34,33,32}
-    py{36,35,34,27}-dj{110,111}-cms{34,35}
+    py{36,35,34,27}-dj{18,19,110,111}-cms{34,35}
 
 skip_missing_interpreters = True
 
@@ -25,16 +24,10 @@ deps =
     dj110: -rtest_requirements/django-1.10.txt
     dj111: -rtest_requirements/django-1.11.txt
 
-    cms32: django-cms>=3.2.1,<3.3
-    cms32: djangocms-text-ckeditor>=2.8.1,<2.9
-
-    cms33: django-cms>=3.3,<3.4
-    cms33: djangocms-text-ckeditor>=3.0
-
     cms34: django-cms>=3.4,<3.5
     cms34: djangocms-text-ckeditor>=3.0,<3.1
 
-    cms35: https://github.com/divio/django-cms/archive/develop.zip
+    cms35: django-cms>=3.5,<3.6
     cms35: djangocms-text-ckeditor>=3.0
 
     coveralls