Fix text editor version selection

nephila · Nov 24, 2015 · 07e7d10 · 07e7d10
1 parent f9eef12
commit 07e7d10
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py
@@ -252,9 +252,9 @@ def parse(args):
         if cms_version == 3:
             requirements.extend(data.REQUIREMENTS['cms-3.0'])
         elif cms_version >= 3.2:
-            requirements.extend(data.REQUIREMENTS['cms-3.x'])
-        elif cms_version >= 3:
-            requirements.extend(data.REQUIREMENTS['cms-3.x'])
+            requirements.extend(data.REQUIREMENTS['cms-3.2'])
+        elif cms_version == 3.1:
+            requirements.extend(data.REQUIREMENTS['cms-3.1'])
         else:
             requirements.extend(data.REQUIREMENTS['cms-2.x'])
 
@@ -278,6 +278,12 @@ def parse(args):
                 else:
                     requirements.extend(data.REQUIREMENTS['plugins-common-master'])
                     requirements.extend(data.REQUIREMENTS['plugins-basic-master'])
+            if cms_version == 3:
+                requirements.extend(data.REQUIREMENTS['ckeditor-3.0'])
+            elif cms_version >= 3.2:
+                requirements.extend(data.REQUIREMENTS['ckeditor-3.2'])
+            elif cms_version == 3.1:
+                requirements.extend(data.REQUIREMENTS['ckeditor-3.1'])
         if args.aldryn:  # pragma: no cover
             requirements.extend(data.REQUIREMENTS['aldryn'])
 

diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py
@@ -91,18 +91,28 @@
     'cms-3.0': [
         'django-mptt<0.7',
     ],
-
-    'cms-3.x': [
+    'cms-3.1': [
+        'django-treebeard>=2.0',
+    ],
+    'cms-3.2': [
         'django-treebeard>=2.0',
     ],
+    'ckeditor-3.0': [
+        'djangocms-text-ckeditor<2.7.0',
+    ],
+    'ckeditor-3.1': [
+        'djangocms-text-ckeditor<2.8.0',
+    ],
+    'ckeditor-3.2': [
+        'djangocms-text-ckeditor>=2.8.0',
+    ],
     'plugins-common': [
         'djangocms-admin-style',
         'djangocms-column',
         'djangocms-flash',
         'djangocms-googlemap',
         'djangocms-inherit',
         'djangocms-style',
-        'djangocms-text-ckeditor>=2.3.0',
     ],
     'plugins-basic': [
         'djangocms-file',

diff --git a/tests/config.py b/tests/config.py
@@ -538,6 +538,7 @@ def test_requirements(self):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         if sys.version_info < (2, 7):
+            print(conf_data.requirements)
             self.assertTrue(conf_data.requirements.find('Django<1.7') > -1)
             self.assertTrue(conf_data.requirements.find('django-reversion>=1.8,<1.8.6') > -1)
             self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') == -1)