diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py index 0bc7db1..ed0283e 100644 --- a/djangocms_installer/config/data.py +++ b/djangocms_installer/config/data.py @@ -11,16 +11,20 @@ '--permissions', '--bootstrap', '--templates', '--starting-page'] -DJANGOCMS_DEVELOP = 'https://github.com/divio/django-cms/archive/develop.zip?{bust}'.format(**bust) -DJANGOCMS_RC = 'https://github.com/divio/django-cms/archive/develop.zip?{bust}'.format(**bust) +DJANGOCMS_DEVELOP = 'https://github.com/divio/django-cms/archive/develop.zip?{bust}'.format( + **bust +) +DJANGOCMS_RC = 'https://github.com/divio/django-cms/archive/release/3.4.x.zip?{bust}'.format( + **bust +) DJANGOCMS_BETA = 'https://github.com/divio/django-cms/archive/3.0.0.beta3.zip' if sys.version_info >= (3, 5): - DJANGOCMS_SUPPORTED = ('3.2', '3.3', 'stable', 'rc', 'develop') - DJANGOCMS_STABLE = 3.3 + DJANGOCMS_SUPPORTED = ('3.2', '3.3', '3.4', 'stable', 'develop') + DJANGOCMS_STABLE = 3.4 else: - DJANGOCMS_SUPPORTED = ('3.2', '3.3', 'stable', 'rc', 'develop') - DJANGOCMS_STABLE = 3.3 + DJANGOCMS_SUPPORTED = ('3.2', '3.3', '3.4', 'stable', 'develop') + DJANGOCMS_STABLE = 3.4 DJANGO_DEVELOP = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust) DJANGO_BETA = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust) @@ -39,9 +43,9 @@ CMS_VERSION_MATRIX = { 'stable': DJANGOCMS_STABLE, - 'rc': 3.4, - 'beta': 3.4, - 'develop': 3.4 + 'rc': 3.5, + 'beta': 3.5, + 'develop': 3.5 } DJANGO_VERSION_MATRIX = { 'stable': DJANGO_STABLE, @@ -52,7 +56,8 @@ VERSION_MATRIX = { 3.2: (1.8, 1.9), 3.3: (1.8, 1.9), - 3.4: (1.8, 1.9), + 3.4: (1.8, 1.9, 1.10), + 3.5: (1.8, 1.9, 1.10), } REQUIREMENTS = { @@ -61,6 +66,7 @@ 'html5lib>=0.999999,<0.99999999', 'Pillow>=3.0', 'django-sekizai>=0.9', + 'django-select2<5.0' 'six', ], 'django-1.8': [ @@ -96,7 +102,7 @@ 'djangocms-googlemap>=0.5,<1.0', 'djangocms-snippet>=1.9,<2.0', 'djangocms-video>=1.1,<2.0', - 'djangocms-column>=1.6,<2.0', + 'djangocms-column>=1.6,<1.7', ], 'plugins-3.3': [ 'djangocms-text-ckeditor>=3.2.1', diff --git a/tests/config.py b/tests/config.py index 817e26d..426a2aa 100644 --- a/tests/config.py +++ b/tests/config.py @@ -26,7 +26,7 @@ def test_default_config(self): self.assertEqual(conf_data.project_name, 'example_prj') - self.assertEqual(conf_data.cms_version, 3.3) + self.assertEqual(conf_data.cms_version, 3.4) self.assertEqual(conf_data.django_version, 1.8) self.assertEqual(conf_data.i18n, 'yes') self.assertEqual(conf_data.reversion, 'yes') @@ -58,7 +58,7 @@ def test_cli_config(self): self.assertEqual(conf_data.project_name, 'example_prj') - self.assertEqual(conf_data.cms_version, 3.3) + self.assertEqual(conf_data.cms_version, 3.4) self.assertEqual(conf_data.django_version, 1.8) self.assertEqual(conf_data.i18n, 'yes') self.assertEqual(conf_data.reversion, 'no') @@ -294,22 +294,22 @@ def test_latest_version(self): self.assertEqual(less_than_version('3.0.1'), '3.1.1') def test_supported_versions(self): - self.assertEqual(supported_versions('stable', 'stable'), (1.8, 3.3)) + self.assertEqual(supported_versions('stable', 'stable'), (1.8, 3.4)) self.assertEqual(supported_versions('stable', '3.1.10'), (1.8, None)) - self.assertEqual(supported_versions('stable', 'rc'), (1.8, 3.4)) - self.assertEqual(supported_versions('stable', 'beta'), (1.8, 3.4)) - self.assertEqual(supported_versions('stable', 'develop'), (1.8, 3.4)) + self.assertEqual(supported_versions('stable', 'rc'), (1.8, 3.5)) + self.assertEqual(supported_versions('stable', 'beta'), (1.8, 3.5)) + self.assertEqual(supported_versions('stable', 'develop'), (1.8, 3.5)) with self.assertRaises(RuntimeError): supported_versions('stable', '2.4'), (1.5, 2.4) with self.assertRaises(RuntimeError): supported_versions('1.5', 'stable'), (1.8, 3.1) - self.assertEqual(supported_versions('1.9', 'stable'), (1.9, 3.3)) - self.assertEqual(supported_versions('1.8', 'stable'), (1.8, 3.3)) - self.assertEqual(supported_versions('1.8.3', 'stable'), (None, 3.3)) - self.assertEqual(supported_versions('beta', 'stable'), (1.9, 3.3)) - self.assertEqual(supported_versions('develop', 'stable'), (1.9, 3.3)) + self.assertEqual(supported_versions('1.9', 'stable'), (1.9, 3.4)) + self.assertEqual(supported_versions('1.8', 'stable'), (1.8, 3.4)) + self.assertEqual(supported_versions('1.8.3', 'stable'), (None, 3.4)) + self.assertEqual(supported_versions('beta', 'stable'), (1.9, 3.4)) + self.assertEqual(supported_versions('develop', 'stable'), (1.9, 3.4)) def test_requirements(self): """ @@ -345,9 +345,9 @@ def test_requirements(self): '-p'+self.project_dir, 'example_prj']) - self.assertTrue(conf_data.requirements.find('django-cms<3.4') > -1) + self.assertTrue(conf_data.requirements.find('django-cms<3.5') > -1) self.assertTrue(conf_data.requirements.find('Django<1.9') > -1) - self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -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-admin-style>=1.2') > -1) self.assertTrue(conf_data.requirements.find('djangocms-column') > -1) @@ -412,7 +412,7 @@ 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', @@ -434,6 +434,25 @@ def test_requirements(self): self.assertTrue(conf_data.requirements.find('pytz') > -1) + conf_data = config.parse([ + '-q', + '--db=postgres://user:pwd@host/dbname', + '--i18n=no', + '--cms-version=3.4', + '--django-version=stable', + '-f', + '--reversion=yes', + '-z=yes', + '-p'+self.project_dir, + 'example_prj']) + + self.assertTrue(conf_data.requirements.find('django-cms<3.5') > -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) + self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1) + self.assertTrue(conf_data.requirements.find('pytz') > -1) + conf_data = config.parse([ '-q', '--db=postgres://user:pwd@host/dbname', @@ -448,7 +467,7 @@ def test_requirements(self): self.assertTrue(conf_data.requirements.find('django-cms<3.4') > -1) self.assertTrue(conf_data.requirements.find('Django<1.9') > -1) - self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1) + self.assertTrue(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-admin-style') > -1) self.assertTrue(conf_data.requirements.find('pytz') > -1) diff --git a/tests/fixtures/configs/config-08.ini b/tests/fixtures/configs/config-08.ini index 7bcb673..96d4926 100644 --- a/tests/fixtures/configs/config-08.ini +++ b/tests/fixtures/configs/config-08.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = . bootstrap = no templates = no diff --git a/tests/fixtures/configs/config-11.ini b/tests/fixtures/configs/config-11.ini index 588ac25..2904f4d 100644 --- a/tests/fixtures/configs/config-11.ini +++ b/tests/fixtures/configs/config-11.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = no templates = no diff --git a/tests/fixtures/configs/config-12.ini b/tests/fixtures/configs/config-12.ini index 3d7ef6e..7d10dc4 100644 --- a/tests/fixtures/configs/config-12.ini +++ b/tests/fixtures/configs/config-12.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = no diff --git a/tests/fixtures/configs/config-13.ini b/tests/fixtures/configs/config-13.ini index d5d06b4..5499e93 100644 --- a/tests/fixtures/configs/config-13.ini +++ b/tests/fixtures/configs/config-13.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-14.ini b/tests/fixtures/configs/config-14.ini index a2ac65d..c8d3255 100644 --- a/tests/fixtures/configs/config-14.ini +++ b/tests/fixtures/configs/config-14.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-15.ini b/tests/fixtures/configs/config-15.ini index 424b514..040e5cb 100644 --- a/tests/fixtures/configs/config-15.ini +++ b/tests/fixtures/configs/config-15.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-16.ini b/tests/fixtures/configs/config-16.ini index 516403b..8bc7dbb 100644 --- a/tests/fixtures/configs/config-16.ini +++ b/tests/fixtures/configs/config-16.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-17.ini b/tests/fixtures/configs/config-17.ini index 2085e35..37ac545 100644 --- a/tests/fixtures/configs/config-17.ini +++ b/tests/fixtures/configs/config-17.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-18.ini b/tests/fixtures/configs/config-18.ini index 2085e35..37ac545 100644 --- a/tests/fixtures/configs/config-18.ini +++ b/tests/fixtures/configs/config-18.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-19.ini b/tests/fixtures/configs/config-19.ini index 7c9d089..d476e93 100644 --- a/tests/fixtures/configs/config-19.ini +++ b/tests/fixtures/configs/config-19.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-20.ini b/tests/fixtures/configs/config-20.ini index 644d74e..0d416de 100644 --- a/tests/fixtures/configs/config-20.ini +++ b/tests/fixtures/configs/config-20.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-21.ini b/tests/fixtures/configs/config-21.ini index 00d597c..183d86b 100644 --- a/tests/fixtures/configs/config-21.ini +++ b/tests/fixtures/configs/config-21.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-22.ini b/tests/fixtures/configs/config-22.ini index 61e9cac..81d43b5 100644 --- a/tests/fixtures/configs/config-22.ini +++ b/tests/fixtures/configs/config-22.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-23.ini b/tests/fixtures/configs/config-23.ini index 058429e..c244b37 100644 --- a/tests/fixtures/configs/config-23.ini +++ b/tests/fixtures/configs/config-23.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-24.ini b/tests/fixtures/configs/config-24.ini index db72cd5..47d063a 100644 --- a/tests/fixtures/configs/config-24.ini +++ b/tests/fixtures/configs/config-24.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-25.ini b/tests/fixtures/configs/config-25.ini index 87a9e4a..6ae2a55 100644 --- a/tests/fixtures/configs/config-25.ini +++ b/tests/fixtures/configs/config-25.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-26.ini b/tests/fixtures/configs/config-26.ini index b2a7228..3abc985 100644 --- a/tests/fixtures/configs/config-26.ini +++ b/tests/fixtures/configs/config-26.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-27.ini b/tests/fixtures/configs/config-27.ini index 156e577..0c7b33d 100644 --- a/tests/fixtures/configs/config-27.ini +++ b/tests/fixtures/configs/config-27.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-28.ini b/tests/fixtures/configs/config-28.ini index 9b5ed87..4bc3115 100644 --- a/tests/fixtures/configs/config-28.ini +++ b/tests/fixtures/configs/config-28.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-30.ini b/tests/fixtures/configs/config-30.ini index 22c3efe..b076a5d 100644 --- a/tests/fixtures/configs/config-30.ini +++ b/tests/fixtures/configs/config-30.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/fixtures/configs/config-32.ini b/tests/fixtures/configs/config-32.ini index 8d2eeeb..7a935c2 100644 --- a/tests/fixtures/configs/config-32.ini +++ b/tests/fixtures/configs/config-32.ini @@ -7,7 +7,7 @@ reversion = no permissions = no languages = en,ru django-version = stable -cms-version = 3.3 +cms-version = 3.4 parent-dir = /test/me bootstrap = yes templates = . diff --git a/tests/main.py b/tests/main.py index 8ed0b3f..372e762 100644 --- a/tests/main.py +++ b/tests/main.py @@ -29,7 +29,7 @@ def test_requirements_invocation(self): main.execute() stdout = self.stdout.getvalue() self.assertTrue(stdout.find('Django<1.9') > -1) - self.assertTrue(stdout.find('django-reversion>=1.10,<1.11') > -1) + self.assertFalse(stdout.find('django-reversion') > -1) self.assertTrue(stdout.find('djangocms-text-ckeditor') > -1) self.assertTrue(stdout.find('djangocms-admin-style') > -1) self.assertTrue(stdout.find('djangocms-column') > -1)