Merge 7e2669a into 9fec66d

nephila · Jun 29, 2019 · 9be807e · 9be807e
2 parents 9fec66d + 7e2669a
commit 9be807e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py
@@ -76,32 +76,45 @@
 
 REQUIREMENTS = {
     'default': [
-        'django-classy-tags>=0.7',
         'html5lib>=1.0.1',
         'Pillow>=3.0',
-        'django-sekizai>=0.9',
         'six',
         'pytz',
     ],
     'django-1.8': [
         'django-polymorphic<2.0',
         'django-mptt<0.9',
+        'django-sekizai<1.0',
+        'django-classy-tags<0.9',
+        'django-polymorphic<2.0',
     ],
     'django-1.9': [
         'django-polymorphic<2.0',
         'django-mptt<0.9',
+        'django-sekizai<1.0',
+        'django-classy-tags<0.9',
+        'django-polymorphic<2.0',
     ],
     'django-1.10': [
         'django-polymorphic<2.0',
         'django-mptt<0.9',
+        'django-sekizai<1.0',
+        'django-classy-tags<0.9',
+        'django-polymorphic<2.0',
     ],
     'django-1.11': [
+        'django-classy-tags>=0.9',
+        'django-sekizai>=1.0',
         'django-mptt>0.9',
     ],
     'django-2.0': [
+        'django-classy-tags>=0.9',
+        'django-sekizai>=1.0',
         'django-mptt>0.9',
     ],
     'django-2.1': [
+        'django-classy-tags>=0.9',
+        'django-sekizai>=1.0',
         'django-mptt>0.9',
     ],
     'reversion-django-1.8': [
@@ -125,7 +138,7 @@
         'django-treebeard>=4.0,<5.0',
     ],
     'cms-3.6': [
-        'djangocms-admin-style>=1.2,<1.3',
+        'djangocms-admin-style>=1.3,<1.5',
         'django-treebeard>=4.0,<5.0',
     ],
     'cms-master': [
@@ -160,10 +173,10 @@
         'djangocms-style>=2.1',
         'djangocms-googlemap>=1.2',
         'djangocms-snippet>=2.1,<2.2',
-        'djangocms-video>=2.0,<2.1',
+        'djangocms-video>=2.0,<2.2',
         'djangocms-column>=1.9',
         'djangocms-file>=2.2,<3.0',
-        'djangocms-picture>=2.0,<2.1',
+        'djangocms-picture>=2.0,<2.2',
     ],
     'plugins-master': [
         'https://github.com/divio/djangocms-text-ckeditor/archive/master.zip?{bust}'
@@ -217,7 +230,7 @@
 """
 
 DRIVERS = {
-    'django.db.backends.postgresql_psycopg2': 'psycopg2',
+    'django.db.backends.postgresql_psycopg2': 'psycopg2<2.8',
     'django.db.backends.postgresql_postgis': 'postgis',
     'django.db.backends.mysql': 'mysqlclient',
     'django.db.backends.sqlite3': '',

diff --git a/tests/config.py b/tests/config.py
@@ -84,7 +84,7 @@ def test_cli_config(self):
         self.assertEqual(conf_data.languages, ['en-ca', 'de', 'it'])
         self.assertEqual(conf_data.project_directory, self.project_dir)
         self.assertEqual(conf_data.db, 'postgres://user:pwd@host/dbname')
-        self.assertEqual(conf_data.db_driver, 'psycopg2')
+        self.assertEqual(conf_data.db_driver, 'psycopg2<2.8')
 
         dj_version, dj_match = get_latest_django(latest_stable=True)
         cms_version = 'develop'
@@ -114,7 +114,7 @@ def test_cli_config(self):
         self.assertEqual(conf_data.languages, ['en', 'de', 'it'])
         self.assertEqual(conf_data.project_directory, self.project_dir)
         self.assertEqual(conf_data.db, 'postgres://user:pwd@host/dbname')
-        self.assertEqual(conf_data.db_driver, 'psycopg2')
+        self.assertEqual(conf_data.db_driver, 'psycopg2<2.8')
 
         dj_version = '1.8'
         cms_version = '3.4'
@@ -145,7 +145,7 @@ def test_cli_config(self):
         self.assertEqual(conf_data.languages, ['en'])
         self.assertEqual(conf_data.project_directory, self.project_dir)
         self.assertEqual(conf_data.db, 'postgres://user:pwd@host/dbname')
-        self.assertEqual(conf_data.db_driver, 'psycopg2')
+        self.assertEqual(conf_data.db_driver, 'psycopg2<2.8')
 
     def test_version_misdj_match(self):
         with self.assertRaises(SystemExit):