Add compatibility with Django 2.0+, django CMS 3.6

.travis.yml

@@ -15,14 +15,17 @@ env:
   - TOXENV='pep8'
   - TOXENV='docs'
   - TOXENV='isort'
-  - DJANGO='django18' CMS='cms34'
-  - DJANGO='django19' CMS='cms34'
-  - DJANGO='django110' CMS='cms34'
+  - DJANGO='django21' CMS='cms36'
+  - DJANGO='django20' CMS='cms36'
+  - DJANGO='django111' CMS='cms36'
+  - DJANGO='django111' CMS='cms35'
   - DJANGO='django111' CMS='cms34'
-  - DJANGO='django18' CMS='cms35'
-  - DJANGO='django19' CMS='cms35'
   - DJANGO='django110' CMS='cms35'
-  - DJANGO='django111' CMS='cms35'
+  - DJANGO='django110' CMS='cms34'
+  - DJANGO='django19' CMS='cms35'
+  - DJANGO='django19' CMS='cms34'
+  - DJANGO='django18' CMS='cms35'
+  - DJANGO='django18' CMS='cms34'
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
@@ -56,6 +59,12 @@ matrix:
     env: DJANGO='django19' CMS='cms34'
   - python: 3.4
     env: DJANGO='django110' CMS='cms34'
+  - python: 3.4
+    env: DJANGO='django111' CMS='cms36'
+  - python: 3.4
+    env: DJANGO='django20' CMS='cms36'
+  - python: 3.4
+    env: DJANGO='django21' CMS='cms36'
   - python: 3.4
     env: DJANGO='django18' CMS='cms35'
   - python: 3.4
@@ -74,6 +83,12 @@ matrix:
     env: DJANGO='django19' CMS='cms35'
   - python: 3.5
     env: DJANGO='django110' CMS='cms35'
+  - python: 3.5
+    env: DJANGO='django111' CMS='cms36'
+  - python: 3.5
+    env: DJANGO='django20' CMS='cms36'
+  - python: 3.5
+    env: DJANGO='django21' CMS='cms36'
   - python: 3.4
     env: TOXENV='pep8'
   - python: 3.4

AUTHORS.rst

@@ -11,3 +11,4 @@ Contributors
 ------------
 
 * Adam Chainz
+* Mark Walker

djangocms_page_tags/migrations/0001_initial.py

@@ -17,8 +17,8 @@ class Migration(migrations.Migration):
             name='PageTags',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
-                ('extended_object', models.OneToOneField(to='cms.Page', editable=False)),
-                ('public_extension', models.OneToOneField(to='djangocms_page_tags.PageTags', related_name='draft_extension', null=True, editable=False)),
+                ('extended_object', models.OneToOneField(to='cms.Page', editable=False, on_delete=models.CASCADE)),
+                ('public_extension', models.OneToOneField(to='djangocms_page_tags.PageTags', related_name='draft_extension', null=True, editable=False, on_delete=models.CASCADE)),
                 ('tags', taggit_autosuggest.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags', help_text='A comma-separated list of tags.')),
             ],
             options={
@@ -29,8 +29,8 @@ class Migration(migrations.Migration):
             name='TitleTags',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
-                ('extended_object', models.OneToOneField(to='cms.Title', editable=False)),
-                ('public_extension', models.OneToOneField(to='djangocms_page_tags.TitleTags', related_name='draft_extension', null=True, editable=False)),
+                ('extended_object', models.OneToOneField(to='cms.Title', editable=False, on_delete=models.CASCADE)),
+                ('public_extension', models.OneToOneField(to='djangocms_page_tags.TitleTags', related_name='draft_extension', null=True, editable=False, on_delete=models.CASCADE)),
                 ('tags', taggit_autosuggest.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags', help_text='A comma-separated list of tags.')),
             ],
             options={

docs/conf.py

@@ -11,7 +11,11 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
+
+import sphinx.environment
+from docutils.utils import get_source_line
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -22,10 +26,7 @@
 parent = os.path.dirname(cwd)
 sys.path.append(parent)
 
-import djangocms_page_tags
-
-import sphinx.environment
-from docutils.utils import get_source_line
+import djangocms_page_tags  # isort:skip
 
 
 def _warn_node(self, msg, node, *args, **kwargs):

setup.py

@@ -4,10 +4,10 @@
 import os
 import sys
 
-import djangocms_page_tags
-
 from setuptools import setup
 
+import djangocms_page_tags
+
 version = djangocms_page_tags.__version__
 
 if sys.argv[-1] == 'publish':
@@ -34,7 +34,7 @@
     include_package_data=True,
     install_requires=(
         'django-cms>=3.4',
-        'django-taggit>=0.11.2,<0.23',
+        'django-taggit>=0.11.2',
         'django-taggit-autosuggest',
         'django-classy-tags>=0.3.4.1',
     ),

tests/test_toolbar.py

@@ -7,7 +7,6 @@
 from cms.toolbar.items import Menu, ModalItem, SubMenu
 from cms.utils.i18n import get_language_object
 from django.contrib.auth.models import Permission, User
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 from django.utils.encoding import force_text
 
@@ -16,6 +15,11 @@
 
 from . import BaseTest
 
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
+
 
 class ToolbarTest(BaseTest):
 

tests/test_utils/urls.py

@@ -7,23 +7,28 @@
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.views.i18n import javascript_catalog
 from django.views.static import serve
+from djangocms_helper.utils import DJANGO_1_11
 
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
     url(r'^media/(?P<path>.*)$', serve,
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     url(r'^media/cms/(?P<path>.*)$', serve,
         {'document_root': get_cms_setting('MEDIA_ROOT'), 'show_indexes': True}),
-    url(r'^jsi18n/(?P<packages>\S+?)/$', javascript_catalog),
 ]
 
 urlpatterns += staticfiles_urlpatterns()
 
-urlpatterns += i18n_patterns(
-    url(r'^', include('cms.urls')),
-)
+if not DJANGO_1_11:
+    urlpatterns += i18n_patterns(
+        url(r'^admin/', admin.site.urls),
+        url(r'^', include('cms.urls')),
+    )
+else:
+    urlpatterns += i18n_patterns(
+        url(r'^admin/', include(admin.site.urls)),
+        url(r'^', include('cms.urls')),
+    )

tox.ini

@@ -1,20 +1,25 @@
 [tox]
-envlist = docs,pep8,isort,py{36,35,34,27}-django{111,110,19,18}-cms{35,34}
+envlist = docs,pep8,isort,py{36,35,34,27}-django{21,20,111,110,19,18}-cms{36,35,34}
 
 [testenv]
 commands = {env:COMMAND:python} setup.py test
 deps =
     django18: Django>=1.8,<1.9
-    django18: django-taggit>=0.18
+    django18: django-taggit>=0.18,<0.23
     django19: Django>=1.9,<1.10
-    django19: django-taggit>=0.18
+    django19: django-taggit>=0.18,<0.23
     django19: django-polymorphic<0.9
     django110: Django>=1.10,<1.11
-    django110: django-taggit>=0.18
+    django110: django-taggit>=0.18,<0.23
     django111: Django>=1.11,<2.0
     django111: django-taggit>=0.18
+    django20: Django>=2.0,<2.1
+    django20: django-taggit>=0.18
+    django21: Django>=2.0,<2.1
+    django21: django-taggit>=0.18
     cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
     cms35: https://github.com/divio/django-cms/archive/release/3.5.x.zip
+    cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip
     -r{toxinidir}/requirements-test.txt
 
 [testenv:pep8]