Fix reversion version for django <1.6

nephila · Aug 5, 2014 · deb8ea7 · deb8ea7
1 parent 1ebe834
commit deb8ea7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py
@@ -202,9 +202,7 @@ def parse(args):
 
         # Reversion package version depends on django version
         if args.reversion:
-            if cms_version >= 3:
-                requirements.append(data.DJANGO_16_REVERSION)
-            elif django_version < 1.5:
+            if django_version < 1.5:
                 requirements.append(data.DJANGO_14_REVERSION)
             elif django_version == 1.5:
                 requirements.append(data.DJANGO_15_REVERSION)

diff --git a/tests/config.py b/tests/config.py
@@ -181,7 +181,7 @@ def test_requirements(self):
         self.assertTrue(conf_data.requirements.find('Django<1.5') > -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('django-reversion>=1.8') > -1)
+        self.assertTrue(conf_data.requirements.find('django-reversion<1.7') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1)
 
         conf_data = config.parse([
@@ -271,15 +271,15 @@ def test_requirements(self):
             '--db=postgres://user:pwd@host/dbname',
             '--i18n=no',
             '--cms-version=develop',
-            '--django-version=1.4',
+            '--django-version=1.5',
             '-f',
             '--reversion=yes',
             '-p'+self.project_dir,
             'example_prj'])
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
-        self.assertTrue(conf_data.requirements.find('Django<1.5') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.8') > -1)
+        self.assertTrue(conf_data.requirements.find('Django<1.6') > -1)
+        self.assertTrue(conf_data.requirements.find('django-reversion>=1.7,<1.8') > -1)
 
         conf_data = config.parse([
             '-q',