diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py index 00087e2..cc26546 100644 --- a/djangocms_installer/config/__init__.py +++ b/djangocms_installer/config/__init__.py @@ -252,8 +252,8 @@ def parse(args): if args.cms_version in ('rc', 'develop'): requirements.extend(data.REQUIREMENTS['cms-master']) - # elif cms_version >= 3.4: - # requirements.extend(data.REQUIREMENTS['cms-3.4']) + elif cms_version >= 3.4: + requirements.extend(data.REQUIREMENTS['cms-3.4']) elif cms_version >= 3.3: requirements.extend(data.REQUIREMENTS['cms-3.3']) elif cms_version >= 3.2: @@ -262,24 +262,15 @@ def parse(args): if not args.no_db_driver: requirements.append(args.db_driver) if not args.no_plugins: - if args.filer: - if args.cms_version in ('rc', 'develop'): - requirements.extend(data.REQUIREMENTS['plugins-common-master']) - requirements.extend(data.REQUIREMENTS['filer']) - else: - requirements.extend(data.REQUIREMENTS['plugins-common']) - requirements.extend(data.REQUIREMENTS['filer']) - # else: - # requirements.extend(data.REQUIREMENTS['plugins-common']) - # requirements.extend(data.REQUIREMENTS['plugins-basic']) if args.cms_version in ('rc', 'develop'): - requirements.extend(data.REQUIREMENTS['ckeditor-master']) - # elif cms_version >= 3.4: - # requirements.extend(data.REQUIREMENTS['ckeditor-3.4']) + requirements.extend(data.REQUIREMENTS['plugins-master']) + elif cms_version >= 3.4: + requirements.extend(data.REQUIREMENTS['plugins-3.4']) elif cms_version >= 3.3: - requirements.extend(data.REQUIREMENTS['ckeditor-3.3']) + requirements.extend(data.REQUIREMENTS['plugins-3.3']) else: - requirements.extend(data.REQUIREMENTS['ckeditor-3.2']) + requirements.extend(data.REQUIREMENTS['plugins-3.2']) + requirements.extend(data.REQUIREMENTS['filer']) 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 index e9ab7a5..0bc7db1 100644 --- a/djangocms_installer/config/data.py +++ b/djangocms_installer/config/data.py @@ -89,33 +89,36 @@ 'https://github.com/divio/djangocms-admin-style/archive/master.zip?{bust}'.format(**bust), 'django-treebeard>=4.0,<5.0', ], - 'ckeditor-3.2': [ - 'djangocms-text-ckeditor>=2.8.1,<=2.9.3', - ], - 'ckeditor-3.3': [ - 'djangocms-text-ckeditor>=3.0,<3.2', - ], - 'ckeditor-3.4': [ - 'djangocms-text-ckeditor>=3.2', - ], - 'ckeditor-master': [ - 'https://github.com/divio/djangocms-text-ckeditor/archive/master.zip?{bust}' - ''.format(**bust), - ], - 'plugins-common': [ - 'djangocms-link>=1.8,<1.9', - 'djangocms-style>=1.7,<1.8', - 'djangocms-googlemap>=0.4,<0.6', - 'djangocms-snippet>=1.8,<2', + 'plugins-3.2': [ + 'djangocms-text-ckeditor>=2.8.1,<3.0', + 'djangocms-link>=1.8,<2.0', + 'djangocms-style>=1.7,<2.0', + 'djangocms-googlemap>=0.5,<1.0', + 'djangocms-snippet>=1.9,<2.0', 'djangocms-video>=1.1,<2.0', + 'djangocms-column>=1.6,<2.0', + ], + 'plugins-3.3': [ + 'djangocms-text-ckeditor>=3.2.1', + 'djangocms-link>=1.8', + 'djangocms-style>=1.7', + 'djangocms-googlemap>=0.5', + 'djangocms-snippet>=1.9', + 'djangocms-video>=2.0', 'djangocms-column>=1.6', ], - 'plugins-basic': [ - 'djangocms-file>=1.0,<1.1', - 'djangocms-picture>=0.2.0,<0.3', - 'djangocms-teaser>=0.2.0,<0.3', + 'plugins-3.4': [ + 'djangocms-text-ckeditor>=3.2.1', + 'djangocms-link>=1.8', + 'djangocms-style>=1.7', + 'djangocms-googlemap>=0.5', + 'djangocms-snippet>=1.9', + 'djangocms-video>=2.0', + 'djangocms-column>=1.6', ], - 'plugins-common-master': [ + 'plugins-master': [ + 'https://github.com/divio/djangocms-text-ckeditor/archive/master.zip?{bust}' + ''.format(**bust), 'https://github.com/divio/djangocms-link/archive/master.zip?{bust}'.format(**bust), 'https://github.com/divio/djangocms-style/archive/master.zip?{bust}'.format(**bust), 'https://github.com/divio/djangocms-googlemap/archive/master.zip?{bust}'.format(**bust), @@ -123,6 +126,11 @@ 'https://github.com/divio/djangocms-video/archive/master.zip?{bust}'.format(**bust), 'https://github.com/divio/djangocms-column/archive/master.zip?{bust}'.format(**bust), ], + 'plugins-basic': [ + 'djangocms-file>=1.0,<1.1', + 'djangocms-picture>=0.2.0,<0.3', + 'djangocms-teaser>=0.2.0,<0.3', + ], 'plugins-basic-master': [ 'https://github.com/divio/djangocms-file/archive/master.zip?{bust}'.format(**bust), 'https://github.com/divio/djangocms-picture/archive/master.zip?{bust}'.format(**bust), diff --git a/tests/config.py b/tests/config.py index 811b2bb..817e26d 100644 --- a/tests/config.py +++ b/tests/config.py @@ -348,7 +348,7 @@ def test_requirements(self): self.assertTrue(conf_data.requirements.find('django-cms<3.4') > -1) self.assertTrue(conf_data.requirements.find('Django<1.9') > -1) self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1) - self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.0') > -1) + self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.2.1') > -1) self.assertTrue(conf_data.requirements.find('djangocms-admin-style>=1.2') > -1) self.assertTrue(conf_data.requirements.find('djangocms-column') > -1) self.assertTrue(conf_data.requirements.find('djangocms-file') == -1) @@ -449,7 +449,7 @@ def test_requirements(self): self.assertTrue(conf_data.requirements.find('django-cms<3.4') > -1) self.assertTrue(conf_data.requirements.find('Django<1.9') > -1) self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1) - self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.0') > -1) + self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.2') > -1) self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1) self.assertTrue(conf_data.requirements.find('pytz') > -1)