From 821208e8d82cd85fb6207a3eafc16b0f307e6aed Mon Sep 17 00:00:00 2001
From: Serghei MIHAI <smihai@entrouvert.com>
Date: Thu, 16 Oct 2014 16:24:12 +0200
Subject: [PATCH] migration to django cms 3: unused plugin removed and new
 ones' packages upgraded

---
 portail_citoyen/admin.py                      |  2 --
 .../a2_service_list_plugin/cms_plugins.py     |  4 ++--
 portail_citoyen/settings.py                   | 21 ++++++++++---------
 requirements.txt                              |  6 ++----
 setup.py                                      |  5 ++---
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/portail_citoyen/admin.py b/portail_citoyen/admin.py
index 0aabfd0..544763b 100644
--- a/portail_citoyen/admin.py
+++ b/portail_citoyen/admin.py
@@ -76,8 +76,6 @@ class GroupPortailCitoyenAdmin(GroupAdmin):
         else:
             return self.default_fieldsets
 
-
-admin.site.unregister(Group)
 admin.site.register(models.Role, GroupPortailCitoyenAdmin)
 
 from authentic2.compat import get_user_model
diff --git a/portail_citoyen/apps/a2_service_list_plugin/cms_plugins.py b/portail_citoyen/apps/a2_service_list_plugin/cms_plugins.py
index 7a4a9d6..27491f3 100644
--- a/portail_citoyen/apps/a2_service_list_plugin/cms_plugins.py
+++ b/portail_citoyen/apps/a2_service_list_plugin/cms_plugins.py
@@ -4,7 +4,7 @@ from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 from models import A2ServiceListPlugin as A2ServiceListPluginModel
 
-from authentic2.idp.views import service_list
+from authentic2.views import service_list
 
 class A2ServiceListPlugin(CMSPluginBase):
     model = A2ServiceListPluginModel
@@ -13,7 +13,7 @@ class A2ServiceListPlugin(CMSPluginBase):
     text_enabled = True
 
     def render(self, context, instance, placeholdre):
-        context.update({ 
+        context.update({
             'services': service_list(context['request']),
         })
         return context
diff --git a/portail_citoyen/settings.py b/portail_citoyen/settings.py
index b285b25..f5d3b95 100644
--- a/portail_citoyen/settings.py
+++ b/portail_citoyen/settings.py
@@ -71,8 +71,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.static',
-    'authentic2.context_processors.federations_processor',
-    'cms.context_processors.media',
+    'authentic2.context_processors.a2_processor',
+    'cms.context_processors.cms_settings',
     'sekizai.context_processors.sekizai',
 )
 
@@ -140,15 +140,8 @@ INSTALLED_APPS = (
     'authentic2.attribute_aggregator',
     'authentic2.disco_service',
     'menus',
-    'cms.plugins.file',
-    'cms.plugins.googlemap',
-    'cms.plugins.link',
-    'cms.plugins.picture',
-    'cms.plugins.snippet',
-    'cms.plugins.teaser',
-    'cms.plugins.video',
-    'cmsplugin_text_wrapper',
     'cms_ajax_text_plugin',
+    'djangocms_text_ckeditor',
     'portail_citoyen.apps.feed_plugin',
     'portail_citoyen.apps.data_source_plugin',
     'portail_citoyen.apps.a2_service_list_plugin',
@@ -158,6 +151,14 @@ INSTALLED_APPS = (
     'portail_citoyen',
 )
 
+try:
+    import cmsplugin_blurp
+    INSTALLED_APPS += (
+        'cmsplugin_blurp',
+    )
+except ImportError:
+    pass
+
 MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
 
 
diff --git a/requirements.txt b/requirements.txt
index 4a449eb..f636419 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,12 @@
 --allow-all-external
 --allow-unverified django-admin-tools
--f https://repos.entrouvert.org/django-cms.git/
-django-cms>=2.5.0,<3.0
+django-cms>=2.5.0
 -f https://repos.entrouvert.org/python-entrouvert.git/
 python-entrouvert
 requests>=1.0.0
-cmsplugin-text-wrapper>=0.5
 feedparser
 django>=1.5.1,<1.6
 authentic2
 south>=0.8.4
 Pillow
-django-cms-ajax-text-plugin
+djangocms-text-ckeditor
diff --git a/setup.py b/setup.py
index 9f7596b..3decac6 100755
--- a/setup.py
+++ b/setup.py
@@ -119,11 +119,10 @@ setup(name="portail_citoyen",
             'feedparser',
             'django>=1.5.1,<1.6',
             'authentic2>2.0.2',
-            'cmsplugin-text-wrapper>=0.5',
-            'django-cms>=2.5,<3.0',
+            'django-cms>=2.5',
             'python-entrouvert',
             'south>=0.8.4',
-            'django-cms-ajax-text-plugin',
+            'djangocms-text-ckeditor',
             'Pillow',
       ],
       dependency_links = [