Skip to content

Commit

Permalink
Merge pull request #327 from nephila/feature/plugins-versions
Browse files Browse the repository at this point in the history
Pin released versions of plugins for django CMS 3.5
  • Loading branch information
yakky committed May 27, 2018
2 parents 24353bf + 5d3bd1f commit 5b84af3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions djangocms_installer/config/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,15 @@
'djangocms-picture>=2.0,<3.0',
],
'plugins-3.5': [
'https://github.com/divio/djangocms-text-ckeditor/archive/master.zip?{bust}'
''.format(**bust),
'https://github.com/divio/djangocms-file/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-link/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-style/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-googlemap/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-snippet/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-picture/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-video/archive/master.zip?{bust}'.format(**bust),
'https://github.com/divio/djangocms-column/archive/master.zip?{bust}'.format(**bust),
'djangocms-text-ckeditor>=3.6.0',
'djangocms-link>=2.1',
'djangocms-style>=2.0',
'djangocms-googlemap>=1.1',
'djangocms-snippet>=2.0',
'djangocms-video>=2.0',
'djangocms-column>=1.7',
'djangocms-file>=2.0,<3.0',
'djangocms-picture>=2.0,<3.0',
],
'plugins-master': [
'https://github.com/divio/djangocms-text-ckeditor/archive/master.zip?{bust}'
Expand Down
2 changes: 1 addition & 1 deletion tests/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def test_requirements(self):
self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
self.assertTrue(conf_data.requirements.find('cmsplugin-filer') == -1)
self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-text-ckeditor') > -1)
self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.6') > -1)
self.assertTrue(conf_data.requirements.find('djangocms-column') > -1)
self.assertTrue(conf_data.requirements.find('djangocms-file') > -1)
self.assertTrue(conf_data.requirements.find('djangocms-flash') == -1)
Expand Down

0 comments on commit 5b84af3

Please sign in to comment.