Merge pull request #335 from nephila/hotfix/html5lib

bump djangocms-text-ckeditor and html5lib
nephila · Nov 21, 2018 · 7b46c5e · 7b46c5e
2 parents 11f3fda + 63fc563
commit 7b46c5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py
@@ -69,7 +69,7 @@
 REQUIREMENTS = {
     'default': [
         'django-classy-tags>=0.7',
-        'html5lib>=0.999999,<0.99999999',
+        'html5lib>=1.0.1',
         'Pillow>=3.0',
         'django-sekizai>=0.9',
         'six',
@@ -110,7 +110,7 @@
         'django-treebeard>=4.0,<5.0',
     ],
     'plugins-3.4': [
-        'djangocms-text-ckeditor>=3.2.1',
+        'djangocms-text-ckeditor>=3.6.1',
         'djangocms-link>=1.8',
         'djangocms-style>=1.7',
         'djangocms-googlemap>=0.5',
@@ -121,7 +121,7 @@
         'djangocms-picture>=2.0,<3.0',
     ],
     'plugins-3.5': [
-        'djangocms-text-ckeditor>=3.6.0',
+        'djangocms-text-ckeditor>=3.6.1',
         'djangocms-link>=2.1',
         'djangocms-style>=2.0',
         'djangocms-googlemap>=1.1',

diff --git a/tests/config.py b/tests/config.py
@@ -329,7 +329,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_34) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
         self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.2.1') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.6.1') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style>=1.2') > -1)
         self.assertTrue(conf_data.requirements.find('django-filer') > -1)
         self.assertTrue(conf_data.requirements.find('cmsplugin-filer') == -1)
@@ -351,7 +351,7 @@ def test_requirements(self):
         self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
         self.assertTrue(conf_data.requirements.find('cmsplugin-filer') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.6') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.6.1') > -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)
@@ -450,7 +450,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_34) > -1)
         self.assertTrue(conf_data.requirements.find('Django<2.0') > -1)
         self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.2') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.6') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
         self.assertTrue(conf_data.requirements.find('pytz') > -1)
 
@@ -469,7 +469,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_34) > -1)
         self.assertTrue(conf_data.requirements.find('Django<2.0') > -1)
         self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.2') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.6') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
         self.assertTrue(conf_data.requirements.find('pytz') > -1)