Add support for django CMS 3.6 final (#340)

README.rst

@@ -16,6 +16,10 @@ project.
 
 Refer to `django CMS Tutorial`_ on how to properly setup your first django CMS project.
 
+.. warning:: Version 1.1 will be the last version to support Python 2.7 and Python 3.4 and Django < 1.11.
+             More 1.0.x versions may be released after 1.1 is out in case important bugfixes will
+             be needed.
+
 .. warning:: Version 1.0 dropped support for Python 3.3 and django CMS < 3.4.
              More 0.9.x versions may be released after 1.0 is out in case important bugfixes will
              be needed.

djangocms_installer/config/__init__.py

@@ -11,9 +11,9 @@
 import pytz
 import six
 
-from . import data, ini
 from .. import compat, utils
 from ..utils import less_than_version, supported_versions
+from . import data, ini
 from .internal import DbAction, validate_project
 
 

djangocms_installer/config/data.py

@@ -23,21 +23,26 @@
 DJANGOCMS_36 = 'django-cms>=3.6,<3.7'
 
 if sys.version_info >= (3, 4):
-    DJANGOCMS_SUPPORTED = ('3.4', '3.5', 'stable', 'lts', 'develop')
-    DJANGOCMS_STABLE = '3.5'
+    DJANGOCMS_SUPPORTED = ('3.4', '3.5', '3.6', 'stable', 'lts', 'develop')
+    DJANGOCMS_STABLE = '3.6'
     DJANGOCMS_LTS = '3.4'
 else:
-    DJANGOCMS_SUPPORTED = ('3.4', '3.5', 'stable', 'lts', 'develop')
-    DJANGOCMS_STABLE = '3.5'
+    DJANGOCMS_SUPPORTED = ('3.4', '3.5', '3.6', 'stable', 'lts', 'develop')
+    DJANGOCMS_STABLE = '3.6'
     DJANGOCMS_LTS = '3.4'
 DJANGOCMS_DEFAULT = DJANGOCMS_STABLE
 
 DJANGO_DEVELOP = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust)
 DJANGO_BETA = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust)
-if sys.version_info >= (3, 4):
+if sys.version_info >= (3, 5):
+
     DJANGO_SUPPORTED = ('1.8', '1.9', '1.10', '1.11', '2.0', '2.1', 'stable', 'lts')
     DJANGO_STABLE = '1.11'
     DJANGO_LTS = '1.11'
+elif sys.version_info >= (3, 4):
+    DJANGO_SUPPORTED = ('1.8', '1.9', '1.10', '1.11', '2.0', 'stable', 'lts')
+    DJANGO_STABLE = '1.11'
+    DJANGO_LTS = '1.11'
 else:
     DJANGO_SUPPORTED = ('1.8', '1.9', '1.10', '1.11', 'stable', 'lts')
     DJANGO_STABLE = '1.11'
@@ -66,7 +71,7 @@
 PACKAGE_MATRIX = {
     '3.4': DJANGOCMS_34,
     '3.5': DJANGOCMS_35,
-    '3.6': DJANGOCMS_DEVELOP,
+    '3.6': DJANGOCMS_36,
 }
 
 REQUIREMENTS = {
@@ -141,7 +146,7 @@
     'plugins-3.5': [
         'djangocms-text-ckeditor>3.6,<3.7',
         'djangocms-link>=2.1,<2.2',
-        'djangocms-style>=2.0,<2.1',
+        'djangocms-snippet>=2.1,<2.2',
         'djangocms-googlemap>=1.1,<1.2',
         'djangocms-snippet>=2.0,<2.1',
         'djangocms-video>=2.0,<2.1',
@@ -150,10 +155,11 @@
         'djangocms-picture>=2.0,<2.1',
     ],
     'plugins-3.6': [
-        'djangocms-text-ckeditor>=3.7',
+        'djangocms-text-ckeditor>=3.7,<3.8',
         'djangocms-link>=2.3',
         'djangocms-style>=2.1',
         'djangocms-googlemap>=1.2',
+        'djangocms-snippet>=2.1,<2.2',
         'djangocms-video>=2.0,<2.1',
         'djangocms-column>=1.9',
         'djangocms-file>=2.2,<3.0',

docs/conf.py

@@ -15,6 +15,10 @@
 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
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -23,10 +27,7 @@
 cwd = os.getcwd()
 parent = os.path.dirname(cwd)
 sys.path.append(parent)
-
-import djangocms_installer
-import sphinx.environment
-from docutils.utils import get_source_line
+import djangocms_installer  # isort:skip
 
 
 def _warn_node(self, msg, node, *args, **kwargs):

setup.py

@@ -3,8 +3,10 @@
 
 import os
 import sys
+
+from setuptools import find_packages, setup
+
 import djangocms_installer
-from setuptools import setup, find_packages
 
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist upload')

tests/base.py

@@ -12,12 +12,6 @@
 from six import StringIO
 
 
-if sys.version_info < (3, 4):
-    dj_ver = '1.8'
-else:
-    dj_ver = '1.10'
-
-
 SYSTEM_ACTIVATE = os.path.join(os.path.dirname(sys.executable), 'activate_this.py')
 
 
@@ -120,3 +114,19 @@ def setUp(self):
                 print('activating virtualenv', self.virtualenv_dir)
             sys.executable = os.path.join(self.virtualenv_dir, 'bin', 'python')
             os.environ['VIRTUAL_ENV'] = self.virtualenv_dir
+
+
+def get_latest_django(latest_stable=False):
+    if sys.version_info < (3, 4) and not latest_stable:
+        dj_ver = '1.8'
+        match = 'Django<1.9'
+    elif sys.version_info < (3, 4) and latest_stable:
+        dj_ver = '1.11'
+        match = 'Django<2.0'
+    elif sys.version_info < (3, 5):
+        dj_ver = '2.0'
+        match = 'Django<2.1'
+    else:
+        dj_ver = '2.1'
+        match = 'Django<2.2'
+    return dj_ver, match