From 0f006cb677b5671bcb856fc2be6f69ad16965144 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Wed, 9 Apr 2014 14:35:47 +0200 Subject: [PATCH 1/2] django CMS 3 release! --- djangocms_installer/config/__init__.py | 2 +- djangocms_installer/config/data.py | 2 +- djangocms_installer/utils.py | 2 +- tests/config.py | 24 ++++++++++++------------ tests/django.py | 16 ++++++++-------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py index 133f6dc..d188169 100644 --- a/djangocms_installer/config/__init__.py +++ b/djangocms_installer/config/__init__.py @@ -41,7 +41,7 @@ def parse(args): choices=('1.4', '1.5', '1.6', 'stable'), default='1.5', help='Django version') parser.add_argument('--cms-version', '-v', dest='cms_version', action='store', - choices=('2.4', 'stable', 'rc', 'develop'), + choices=('2.4', '3.0', 'stable', 'develop'), default='stable', help='django CMS version') parser.add_argument('--parent-dir', '-p', dest='project_directory', required=True, default='', diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py index dc68d78..ec0a01c 100644 --- a/djangocms_installer/config/data.py +++ b/djangocms_installer/config/data.py @@ -6,7 +6,7 @@ DJANGOCMS_DEVELOP = '-e git+https://github.com/divio/django-cms@develop#egg=django-cms' DJANGOCMS_RC = 'https://github.com/divio/django-cms/archive/3.0c2.zip' DJANGOCMS_BETA = 'https://github.com/divio/django-cms/archive/3.0.0.beta3.zip' -DJANGOCMS_LATEST = '2.4' +DJANGOCMS_LATEST = '3.0' DJANGO_DEVELOP = 'https://github.com/django/django/archive/master.zip' DJANGO_LATEST = '1.5' # this is not true, but it's the most recent version diff --git a/djangocms_installer/utils.py b/djangocms_installer/utils.py index 4a08732..4086920 100644 --- a/djangocms_installer/utils.py +++ b/djangocms_installer/utils.py @@ -52,7 +52,7 @@ def supported_versions(django, cms): cms_version = float(cms) except ValueError: if cms == 'stable': - cms_version = 2.4 + cms_version = 3.0 elif django == 'rc': django_version = 3.0 elif django == 'beta': diff --git a/tests/config.py b/tests/config.py index 51b5208..6b8a9e9 100644 --- a/tests/config.py +++ b/tests/config.py @@ -20,7 +20,7 @@ def test_default_config(self): self.assertEqual(conf_data.project_name, 'example_prj') - self.assertEqual(conf_data.cms_version, 2.4) + self.assertEqual(conf_data.cms_version, 3.0) self.assertEqual(conf_data.django_version, 1.5) self.assertEqual(conf_data.i18n, 'yes') self.assertEqual(conf_data.reversion, 'yes') @@ -164,18 +164,18 @@ def test_requirements(self): '-p'+self.project_dir, 'example_prj']) - self.assertTrue(conf_data.requirements.find('django-cms<2.5') > -1) + self.assertTrue(conf_data.requirements.find('django-cms<3.1') > -1) 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.7') > -1) - self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') == -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('djangocms-text-ckeditor') > -1) conf_data = config.parse([ '-q', '--db=postgres://user:pwd@host/dbname', '--i18n=no', - '--cms-version=stable', + '--cms-version=2.4', '--django-version=stable', '-f', '-p'+self.project_dir, @@ -202,13 +202,13 @@ def test_requirements(self): '-q', '--db=postgres://user:pwd@host/dbname', '--i18n=no', - '--cms-version=rc', + '--cms-version=stable', '--django-version=stable', '--reversion=yes', '-p'+self.project_dir, 'example_prj']) - self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_RC) > -1) + self.assertTrue(conf_data.requirements.find('django-cms<3.1') > -1) self.assertTrue(conf_data.requirements.find('Django<1.7') > -1) self.assertTrue(conf_data.requirements.find('django-reversion>=1.8') > -1) self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1) @@ -228,14 +228,14 @@ def test_requirements(self): '-q', '--db=postgres://user:pwd@host/dbname', '--i18n=no', - '--cms-version=rc', + '--cms-version=develop', '--django-version=stable', '-f', '--reversion=yes', '-p'+self.project_dir, 'example_prj']) - self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_RC) > -1) + self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1) self.assertTrue(conf_data.requirements.find('Django<1.7') > -1) self.assertTrue(conf_data.requirements.find('django-reversion>=1.8') > -1) self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1) @@ -257,14 +257,14 @@ def test_requirements(self): '-q', '--db=postgres://user:pwd@host/dbname', '--i18n=no', - '--cms-version=rc', + '--cms-version=develop', '--django-version=1.4', '-f', '--reversion=yes', '-p'+self.project_dir, 'example_prj']) - self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_RC) > -1) + 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) diff --git a/tests/django.py b/tests/django.py index 913a13c..6bc4151 100644 --- a/tests/django.py +++ b/tests/django.py @@ -25,7 +25,7 @@ def test_patch_16(self): config_data = config.parse(['--db=sqlite://localhost/test.db', '--lang=en', '--django-version=1.6', - '--cms-version=develop', + '--cms-version=3.0', '-q', '-u', '-zno', '--i18n=no', '-p'+self.project_dir, 'example_path_16']) @@ -78,7 +78,7 @@ def test_patch_24_standard(self): config_data = config.parse(['--db=sqlite://localhost/test.db', '--lang=en', '--django-version=1.5', - '--cms-version=stable', + '--cms-version=2.4', '-q', '-u', '-zno', '--i18n=no', '-p'+self.project_dir, 'example_path_24_s']) @@ -123,7 +123,7 @@ def test_patch_24_filer(self): config_data = config.parse(['--db=sqlite://localhost/test.db', '--lang=en', '--django-version=1.5', - '--cms-version=stable', + '--cms-version=2.4', '-f', '-q', '-u', '-zno', '--i18n=no', '-p'+self.project_dir, 'example_path_24_f']) @@ -166,7 +166,7 @@ def test_patch(self): config_data = config.parse(['--db=sqlite://localhost/test.db', '--lang=en', '--django-version=1.5', - '--cms-version=develop', + '--cms-version=3.0', '-f', '-q', '-u', '-zno', '--i18n=no', '-p'+self.project_dir, 'example_path']) install.requirements(config_data.requirements) @@ -229,10 +229,10 @@ def test_patch(self): del(sys.modules["%s.settings" % config_data.project_name]) @unittest.skip("Currently unsupported test") - def test_setup_database_filer(self): + def test_database_setup_filer(self): config_data = config.parse(['--db=sqlite://localhost/test.db', '-f', '-q', '-u', - '--cms-version=rc', + '--cms-version=3.0', '-p'+self.project_dir, 'cms_project']) install.requirements(config_data.requirements) django.create_project(config_data) @@ -252,9 +252,9 @@ def test_setup_database_filer(self): query = project_db.execute('SELECT * FROM cms_page') self.assertTrue(query) - def test_setup_database(self): + def test_database_setup(self): config_data = config.parse(['--db=sqlite://localhost/test.db', - '-q', '-u', '--cms-version=rc', + '-q', '-u', '--cms-version=3.0', '-p'+self.project_dir, 'cms_project']) install.requirements(config_data.requirements) django.create_project(config_data) From 363e88931eae007689468ecebf97ae5bddcd63f1 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Wed, 9 Apr 2014 14:57:00 +0200 Subject: [PATCH 2/2] Version bump --- HISTORY.rst | 7 +++++++ djangocms_installer/__init__.py | 2 +- docs/reference.rst | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index b1e1933..23da02a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -60,4 +60,11 @@ History * Update for django CMS 3.0c2 +0.4 (2014-04-09) +++++++++++++++++ + +* Update for django CMS 3.0 stable! +* Fixes for settings parameter + + diff --git a/djangocms_installer/__init__.py b/djangocms_installer/__init__.py index 43e5c8c..73b2c79 100644 --- a/djangocms_installer/__init__.py +++ b/djangocms_installer/__init__.py @@ -2,4 +2,4 @@ # -*- coding: utf-8 -*- __author__ = 'Iacopo Spalletti' __email__ = 'i.spalletti@nephila.it' -__version__ = '0.3.5' +__version__ = '0.4.0' diff --git a/docs/reference.rst b/docs/reference.rst index c7720bb..7df0563 100644 --- a/docs/reference.rst +++ b/docs/reference.rst @@ -24,8 +24,8 @@ The following arguments can be overridden in :ref:`wizard_mode` * ``--reversion``, ``-e``: Install and configure reversion support, choices: ``yes|no``, default: ``yes`` * ``--permissions``: Activate CMS permission management; choices: ``yes|no``, default: ``yes`` * ``--languages``, ``-l``: Languages to enable. Option can be provided multiple times, or as a comma separated list -* ``--django-version``: Django version; choices: ``1.4|1.5|stable``, default: ``stable`` -* ``--cms-version``, ``-v``: django CMS version, choices: ``2.4|stable|beta|develop``. default: ``stable`` +* ``--django-version``: Django version; choices: ``1.4|1.5|1.6|stable``, default: ``stable`` +* ``--cms-version``, ``-v``: django CMS version, choices: ``2.4|3.0|stable|develop``. default: ``stable`` * ``--bootstrap``, ``-v``: Use Twitter Bootstrap as theme, choices: ``yes|no``, default: ``no`` * ``--starting-page``, ``-v``: Load a starting page with examples after installation, choices: ``yes|no``, default: ``no``