Add support for django 1.9

nephila · Jan 18, 2016 · 90ed95e · 90ed95e
1 parent 3fca8c7
commit 90ed95e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py
@@ -322,6 +322,8 @@ def parse(args):
                 requirements.extend(data.REQUIREMENTS['reversion-django-1.7'])
             elif django_version == 1.8:
                 requirements.extend(data.REQUIREMENTS['reversion-django-1.8'])
+            elif django_version == 1.9:
+                requirements.extend(data.REQUIREMENTS['reversion-django-1.9'])
 
         requirements.extend(data.REQUIREMENTS['default'])
 

diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py
@@ -31,13 +31,16 @@
     DJANGO_SUPPORTED = ('1.4', '1.5', '1.6', 'stable')
     DJANGO_STABLE = 1.6
 elif sys.version_info >= (3, 5):
-    DJANGO_SUPPORTED = ('1.8', 'stable')
+    DJANGO_SUPPORTED = ('1.8', '1.9', 'stable')
+    DJANGO_STABLE = 1.8
+elif sys.version_info >= (3, 4):
+    DJANGO_SUPPORTED = ('1.5', '1.6', '1.7', '1.8', '1.9', 'stable')
     DJANGO_STABLE = 1.8
 elif sys.version_info >= (3, 0):
     DJANGO_SUPPORTED = ('1.5', '1.6', '1.7', '1.8', 'stable')
     DJANGO_STABLE = 1.8
 else:
-    DJANGO_SUPPORTED = ('1.4', '1.5', '1.6', '1.7', '1.8', 'stable')
+    DJANGO_SUPPORTED = ('1.4', '1.5', '1.6', '1.7', '1.8', '1.9', 'stable')
     DJANGO_STABLE = 1.8
 
 CMS_VERSION_MATRIX = {
@@ -55,7 +58,7 @@
 VERSION_MATRIX = {
     2.4: (1.4, 1.5),
     3.0: (1.4, 1.7),
-    3.1: (1.6, 1.9),
+    3.1: (1.6, 1.8),
     3.2: (1.6, 1.9),
 }
 
@@ -77,14 +80,17 @@
         'django-reversion>=1.7,<1.8',
     ],
     'reversion-django-1.6': [
-        'django-reversion>=1.8,<1.8.6',
+        'django-reversion>=1.8,<1.9',
     ],
     'reversion-django-1.7': [
-        'django-reversion>=1.8.2,<1.8.6',
+        'django-reversion>=1.8.2,<1.9',
     ],
     'reversion-django-1.8': [
         'django-reversion>=1.8.7,<1.9',
     ],
+    'reversion-django-1.9': [
+        'django-reversion>=1.10,<1.11',
+    ],
     'cms-2.x': [
         'django-mptt>=0.5.1,<0.5.3',
     ],
@@ -102,12 +108,12 @@
         'djangocms-text-ckeditor<2.7.0',
     ],
     'ckeditor-3.1': [
-        'djangocms-admin-style<0.3',
+        'djangocms-admin-style<1.0',
         'djangocms-text-ckeditor<2.8.0',
     ],
     'ckeditor-3.2': [
         'djangocms-admin-style>=1.0.6',
-        'djangocms-text-ckeditor>=2.8.0',
+        'djangocms-text-ckeditor>=2.8.1',
     ],
     'plugins-common': [
         'djangocms-column',

diff --git a/djangocms_installer/utils.py b/djangocms_installer/utils.py
@@ -69,8 +69,9 @@ def supported_versions(django, cms):
     try:
         if (
                 cms_version and django_version and
-                not (VERSION_MATRIX[cms_version][0] <= django_version
-                     <= VERSION_MATRIX[cms_version][1])
+                not (VERSION_MATRIX[cms_version][0] <=
+                     django_version <=
+                     VERSION_MATRIX[cms_version][1])
         ):
             raise RuntimeError(
                 'Django and django CMS versions doesn\'t match: '

diff --git a/tests/base.py b/tests/base.py
@@ -18,9 +18,9 @@
 if sys.version_info < (2, 7):
     dj_ver = '1.6'
 elif sys.version_info < (3, 5):
-    dj_ver = '1.7'
-else:
     dj_ver = '1.8'
+else:
+    dj_ver = '1.9'
 
 
 SYSTEM_ACTIVATE = os.path.join(os.path.dirname(sys.executable), 'activate_this.py')

diff --git a/tests/config.py b/tests/config.py
@@ -339,12 +339,12 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find('django-cms<3.2') > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
         else:
             self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('django-reversion>=1.8.7') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor<2.8') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-admin-style<0.3') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-admin-style<1.0') > -1)
         self.assertTrue(conf_data.requirements.find('django-filer') > -1)
         self.assertTrue(conf_data.requirements.find('cmsplugin-filer') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1)
@@ -391,7 +391,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find('django-cms<3.3') > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
         else:
             self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('django-reversion>=1.8.7') > -1)
@@ -423,7 +423,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
         else:
             self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('django-reversion>=1.8.7') > -1)
@@ -461,7 +461,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
         else:
             self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('django-reversion>=1.8.7') > -1)
@@ -483,7 +483,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
         else:
             self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('django-reversion>=1.8.7') > -1)
@@ -509,7 +509,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=2.8') > -1)
             self.assertTrue(conf_data.requirements.find('djangocms-admin-style>=1.0.6') > -1)
             self.assertTrue(conf_data.requirements.find('djangocms-teaser') > -1)
@@ -541,7 +541,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         if sys.version_info < (2, 7):
             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('django-reversion>=1.8,<1.9') > -1)
             self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') == -1)
             self.assertTrue(conf_data.requirements.find('djangocms-admin-style') == -1)
             self.assertTrue(conf_data.requirements.find('djangocms-teaser') == -1)

diff --git a/tests/main.py b/tests/main.py
@@ -25,10 +25,10 @@ def test_requirements_invocation(self):
         stdout = self.stdout.getvalue()
         if sys.version_info < (2, 7):
             self.assertTrue(stdout.find('Django<1.7') > -1)
-            self.assertTrue(stdout.find('django-reversion>=1.8,<1.8.6') > -1)
+            self.assertTrue(stdout.find('django-reversion>=1.8,<1.9') > -1)
         else:
             self.assertTrue(stdout.find('Django<1.9') > -1)
-            self.assertTrue(stdout.find('django-reversion>=1.8.7') > -1)
+            self.assertTrue(stdout.find('django-reversion>=1.8.7,<1.9') > -1)
         self.assertTrue(stdout.find('djangocms-text-ckeditor') > -1)
         self.assertTrue(stdout.find('djangocms-admin-style') > -1)
         self.assertTrue(stdout.find('djangocms-column') > -1)