0001-general-remove-blurps-20914.patch

Frédéric Péters, 28 décembre 2017 11:12

Voir les différences: en ligne côte à côte

Subject: [PATCH] general: remove blurps (#20914)

 README                   |  4 ----
 combo/apps/wcs/models.py |  2 +-
 combo/data/models.py     | 41 -----------------------------------------
 combo/settings.py        |  1 -
 debian/control           |  1 -
 jenkins.sh               |  1 -
 requirements.txt         |  1 -
 setup.py                 |  1 -
 8 files changed, 1 insertion(+), 51 deletions(-)

     documentation of django-mellon.
     Blurps (from cmsplugin-blurp module) can be used to define additional cell
     types, the CMS_PLUGIN_BLURP_RENDERERS variable is used to hold them, details
     can be found in the cmsplugin-blurp documentation.
     In addition to common attributes Combo supports a 'private' attribute, that can
     be used to exclude the given blurp from selectable cells.  The blurp itself can
     still be referenced manually in a template file. This is useful to avoid

             try:
                 context['forms'] = list(context['forms'][self.wcs_site]['data'])
             except (KeyError, TypeError) as e:
                 # an error occured in the blurp
                 # an error occured when getting the data
                 context['forms'] = []
             # default sort is alphabetical, it's always done as this will serve as

     from django.test.client import RequestFactory
     from .fields import RichTextField
     import cmsplugin_blurp.utils
     from jsonfield import JSONField
-...
         def render(self, context):
             return ''
     @register_cell_class
     class BlurpCell(CellBase):
         blurp_key = models.CharField(max_length=50)
         @classmethod
         def get_cell_types(cls):
             try:
                 blurp_renderers = settings.CMS_PLUGIN_BLURP_RENDERERS
             except AttributeError:
                 return []
             l = []
             for blurp_key, blurp_value in blurp_renderers.items():
                 if blurp_value.get('private'):
                     continue
                 l.append({
                     'name': blurp_value.get('name'),
                     'cell_type_str': cls.get_cell_type_str(),
                     'group': _('Extra'),
                     'variant': blurp_key,
                 })
             l.sort(lambda x, y: cmp(x.get('name'), y.get('name')))
             return l
         def get_label(self):
             return settings.CMS_PLUGIN_BLURP_RENDERERS[self.blurp_key]['name']
         def set_variant(self, variant):
             self.blurp_key = variant
         def render(self, context):
             if settings.CMS_PLUGIN_BLURP_RENDERERS[self.blurp_key].get('ajax') and not context.get('synchronous'):
                 raise NothingInCacheException()
             renderer = cmsplugin_blurp.utils.resolve_renderer(self.blurp_key)
             template = renderer.render_template()
             context = renderer.render(context)
             return template.render(context)
         def get_default_form_class(self):
             return None
     @register_cell_class
     class MenuCell(CellBase):

combo/settings.py
58	58	'ckeditor',
59	59	'gadjo',
60	60	'sorl.thumbnail',
61		'cmsplugin_blurp',
62	61	'combo.data',
63	62	'combo.profile',
64	63	'combo.manager',

debian/control
14	14	python-gadjo,
15	15	python-requests,
16	16	python-feedparser,
17		python-django-cmsplugin-blurp,
18	17	python-xstatic-chartnew-js,
19	18	python-xstatic-josefinsans,
20	19	python-xstatic-leaflet,

jenkins.sh
16	16	pip install --upgrade -r requirements.txt
17	17	pip install --upgrade pytest pytest-django pytest-cov WebTest django-webtest 'setuptools<34'
18	18	pip install --upgrade 'django>=1.8, <1.9'
19		pip install --no-deps --upgrade 'git+http://repos.entrouvert.org/cmsplugin-blurp.git/#egg=django-cmsplugin-blurp' # use blurp from git/master for now
20	19	pip install --upgrade XStatic-ChartNew.js
21	20	pip install --upgrade mock
22	21

requirements.txt
1	1	Django>=1.8, <1.9
2	2	django-ckeditor<4.5.3
3	3	gadjo
4		django-cmsplugin-blurp
5	4	feedparser
6	5	django-jsonfield
7	6	requests

         install_requires=['django>=1.8, <1.9',
             'django-ckeditor<4.5.3',
             'gadjo',
             'django-cmsplugin-blurp',
             'feedparser',
             'django-jsonfield',
             'requests',
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-general-remove-blurps-20914.patch