From dcb2dc9c6ae4f68fe70e0f80daf6f1947487b924 Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 15 Mar 2018 11:23:59 +0000 Subject: [PATCH] uninstall djangocms-googlemap 1.1.0 --- addons/djangocms-googlemap/addon.json | 6 ---- addons/djangocms-googlemap/aldryn_config.py | 35 --------------------- addons/djangocms-googlemap/settings.json | 4 --- requirements.in | 1 - settings.py | 1 - 5 files changed, 47 deletions(-) delete mode 100644 addons/djangocms-googlemap/addon.json delete mode 100644 addons/djangocms-googlemap/aldryn_config.py delete mode 100644 addons/djangocms-googlemap/settings.json diff --git a/addons/djangocms-googlemap/addon.json b/addons/djangocms-googlemap/addon.json deleted file mode 100644 index e1fac7b..0000000 --- a/addons/djangocms-googlemap/addon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "installed-apps": [ - "djangocms_googlemap" - ], - "package-name": "djangocms-googlemap" -} \ No newline at end of file diff --git a/addons/djangocms-googlemap/aldryn_config.py b/addons/djangocms-googlemap/aldryn_config.py deleted file mode 100644 index c0feec0..0000000 --- a/addons/djangocms-googlemap/aldryn_config.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -from aldryn_client import forms - - -def split_and_strip(string): - return [item.strip() for item in string.split(',') if item] - - -class Form(forms.BaseForm): - templates = forms.CharField( - 'List of additional templates (comma separated)', - required=False, - ) - api_key = forms.CharField( - 'You need to provide a valid Google Maps API key ' - 'https://developers.google.com/maps/documentation/javascript/get-api-key', - required=True, - ) - - def clean(self): - data = super(Form, self).clean() - # prettify - data['templates'] = ', '.join(split_and_strip(data['templates'])) - return data - - def to_settings(self, data, settings): - if data['templates']: - settings['DJANGOCMS_GOOGLEMAP_TEMPLATES'] = [ - (item, item) - for item in split_and_strip(data['templates']) - ] - if data['api_key']: - settings['DJANGOCMS_GOOGLEMAP_API_KEY'] = data['api_key'] - - return settings diff --git a/addons/djangocms-googlemap/settings.json b/addons/djangocms-googlemap/settings.json deleted file mode 100644 index 1a21ead..0000000 --- a/addons/djangocms-googlemap/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "api_key": null, - "templates": null -} \ No newline at end of file diff --git a/requirements.in b/requirements.in index db1bb15..0d61161 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,6 @@ https://control.divio.com/api/v1/apps/serve/aldryn-django/1.8.19.1/5dfa4420-e075 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.1.16/dbe0c45a-c981-4beb-8624-b0d2c4196aa0/aldryn-sso-1.1.16.tar.gz#egg=aldryn-sso==1.1.16 https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.5.1.3/2dd6f80a-825c-4aaf-b37f-519a6c46108e/aldryn-django-cms-3.5.1.3.tar.gz#egg=aldryn-django-cms==3.5.1.3 https://control.divio.com/api/v1/apps/serve/djangocms-file/2.0.2/f0e22a3c-8890-4013-93bc-02f0e937a570/djangocms-file-2.0.2.tar.gz#egg=djangocms-file==2.0.2 -https://control.divio.com/api/v1/apps/serve/djangocms-googlemap/1.1.0/829bcfeb-0edc-4074-9483-88c27410d154/djangocms-googlemap-1.1.0.tar.gz#egg=djangocms-googlemap==1.1.0 https://control.divio.com/api/v1/apps/serve/djangocms-history/0.5.3/05803675-6e8d-4637-b14b-1bb8d18b24b3/djangocms-history-0.5.3.tar.gz#egg=djangocms-history==0.5.3 https://control.divio.com/api/v1/apps/serve/djangocms-link/2.1.2/35b986c1-fafb-46ee-b665-aa36603f233a/djangocms-link-2.1.2.tar.gz#egg=djangocms-link==2.1.2 https://control.divio.com/api/v1/apps/serve/djangocms-picture/2.0.6/005e8663-d1cc-4667-936c-30709edad076/djangocms-picture-2.0.6.tar.gz#egg=djangocms-picture==2.0.6 diff --git a/settings.py b/settings.py index 559184c..0730877 100644 --- a/settings.py +++ b/settings.py @@ -7,7 +7,6 @@ INSTALLED_ADDONS = [ 'aldryn-sso', 'aldryn-django-cms', 'djangocms-file', - 'djangocms-googlemap', 'djangocms-history', 'djangocms-link', 'djangocms-picture',