Repository: nephila/djangocms-installer
Pull request #222 (2015-12-03 07:20:27)

Remove djangocms-flash from installed plugins


Patch:
diff --git a/HISTORY.rst b/HISTORY.rst
index 3fa4b1a..8d99034 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 -------
 
+0.8.4 (unreleased)
+++++++++++++++++++
+
+*  Remove flash plugin from installed plugins
+
 0.8.3 (2015-11-25)
 ++++++++++++++++++
 
diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py
index 3cc7037..0f4981d 100644
--- a/djangocms_installer/config/data.py
+++ b/djangocms_installer/config/data.py
@@ -111,7 +111,6 @@ REQUIREMENTS = {
     ],
     'plugins-common': [
         'djangocms-column',
-        'djangocms-flash',
         'djangocms-googlemap',
         'djangocms-inherit',
         'djangocms-style',
@@ -125,7 +124,6 @@ REQUIREMENTS = {
     ],
     'plugins-common-master': [
         'https://github.com/divio/djangocms-column/archive/master.zip?%(bust)s' % bust,
-        'https://github.com/divio/djangocms-flash/archive/master.zip?%(bust)s' % bust,
         'https://github.com/divio/djangocms-googlemap/archive/master.zip?%(bust)s' % bust,
         'https://github.com/divio/djangocms-inherit/archive/master.zip?%(bust)s' % bust,
         'https://github.com/divio/djangocms-link/archive/master.zip?%(bust)s' % bust,
@@ -176,7 +174,6 @@ PLUGIN_LIST_TEXT = """
 djangocms_installer will install and configure the following plugins:
  * djangocms_column (Column plugin)
  * djangocms-file (File plugin)
- * djangocms-flash (Flash plugin)
  * djangocms-googlemap (GoogleMap plugin)
  * djangocms-inherit (Inherit plugin)
  * djangocms-link (Link plugin)
diff --git a/djangocms_installer/config/settings.py b/djangocms_installer/config/settings.py
index 7164230..6f63e90 100644
--- a/djangocms_installer/config/settings.py
+++ b/djangocms_installer/config/settings.py
@@ -84,7 +84,6 @@ STANDARD_PLUGINS_2 = (
 )
 STANDARD_PLUGINS_3 = (
     'djangocms_file',
-    'djangocms_flash',
     'djangocms_googlemap',
     'djangocms_inherit',
     'djangocms_link',
@@ -117,7 +116,6 @@ FILER_PLUGINS_3 = (
     'cmsplugin_filer_teaser',
     'cmsplugin_filer_utils',
     'cmsplugin_filer_video',
-    'djangocms_flash',
     'djangocms_googlemap',
     'djangocms_inherit',
     'djangocms_link',
@@ -203,7 +201,6 @@ MIGRATIONS_CHECK_MODULES = (
     'cmsplugin_filer_video',
     'djangocms_text_ckeditor',
     'djangocms_column',
-    'djangocms_flash',
     'djangocms_googlemap',
     'djangocms_inherit',
     'djangocms_link',


Test patch:
diff --git a/tests/config.py b/tests/config.py
index d0265d5..4275c4a 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -399,7 +399,7 @@ class TestConfig(BaseTestClass):
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style>=1.0.6') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-column') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-file') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-flash') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-flash') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-googlemap') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-inherit') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-link') > -1)
@@ -433,7 +433,7 @@ class TestConfig(BaseTestClass):
         self.assertTrue(conf_data.requirements.find('cmsplugin-filer') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-column') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-file') == -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-flash') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-flash') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-googlemap') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-inherit') > -1)
         #self.assertTrue(conf_data.requirements.find('djangocms-link') > -1)
diff --git a/tests/django.py b/tests/django.py
index af5beae..01f3a30 100644
--- a/tests/django.py
+++ b/tests/django.py
@@ -215,7 +215,7 @@ class TestDjango(IsolatedTestClass):
         self.assertTrue('filer' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_column' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_file' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_flash' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_flash' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_googlemap' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_inherit' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_link' in project.settings.INSTALLED_APPS)
@@ -548,7 +548,7 @@ class TestDjango(IsolatedTestClass):
         self.assertTrue('filer' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_column' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_file' not in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_flash' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_flash' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_googlemap' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_inherit' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_link' in project.settings.INSTALLED_APPS)
diff --git a/tests/main.py b/tests/main.py
index fff8827..eae88db 100644
--- a/tests/main.py
+++ b/tests/main.py
@@ -33,7 +33,7 @@ class TestMain(IsolatedTestClass):
         self.assertTrue(stdout.find('djangocms-admin-style') > -1)
         self.assertTrue(stdout.find('djangocms-column') > -1)
         self.assertTrue(stdout.find('djangocms-file') > -1)
-        self.assertTrue(stdout.find('djangocms-flash') > -1)
+        self.assertTrue(stdout.find('djangocms-flash') == -1)
         self.assertTrue(stdout.find('djangocms-googlemap') > -1)
         self.assertTrue(stdout.find('djangocms-inherit') > -1)
         self.assertTrue(stdout.find('djangocms-link') > -1)
@@ -85,11 +85,13 @@ class TestMain(IsolatedTestClass):
                 # Checking we successfully completed the whole process
                 self.assertTrue(('Get into "%s" directory and type "python manage.py runserver" to start your project' % self.project_dir) in self.stdout.getvalue())
 
+    @unittest.skipIf(sys.version_info < (2, 7),
+                     reason='django CMS develop does not support python 2.6')
     def test_develop(self):
         with patch('sys.stdout', self.stdout):
             with patch('sys.stderr', self.stderr):
                 sys.argv = ['main'] + ['--db=sqlite://localhost/test.db',
-                                       '-len', '--cms-version=develop', '--django=%s' % dj_ver,
+                                       '-len', '--cms-version=develop', '--django=1.8',
                                        '-q', '-u', '-p'+self.project_dir,
                                        'example_prj']
                 main.execute()