Merge lp:~dholbach/developer-ubuntu-com/django-cms-update into lp:developer-ubuntu-com

[Daniel Holbach]

[lp:~dholbach/developer-ubuntu-com/django-cms-update]

151. By David Callé on 2015-11-25

Merge trunk

152. By David Callé on 2015-11-27

Merge various updates

153. By David Callé on 2015-11-27

Alternate deps branch

154. By David Callé on 2015-11-27

Remove swift_proxy references

155. By David Callé on 2015-11-27

revert collectstatic change, seems to hang on staging

156. By David Callé on 2015-11-27

revert collectstatic change, seems to hang on staging

157. By David Callé on 2015-12-03

Allow iframes in ckeditor

158. By David Callé on 2015-12-04

Adapt for new staging deps branch

159. By David Callé on 2015-12-11

Revert to one pip branch

160. By David Callé on 2015-12-11

Fix wrong bzr commands for pip-cache, my bad

161. By David Callé on 2015-12-11

Bump pip-cache revno

162. By David Callé on 2015-12-11

Blog archives fix (dholbach)

163. By David Callé on 2015-12-11

Bug #1525202: initdb could add an 'English' and 'Chinese' category for blog posts

164. By David Callé on 2015-12-15

Update deps and migrations

165. By David Callé on 2015-12-15

Update pip cache revno

[Daniel Holbach (dholbach)]

Packages which are not updated in this newest revision:

Pillow (Current: 2.9.0 Latest: 3.1.0)
 - does not build.

django-reversion (Current: 1.9.3 Latest: 1.10.0)
 - crash in cms(?)

argparse (Current: 1.2.1 Latest: 1.4.0)
pip (Current: 1.5.6 Latest: 7.1.2)
Django-Select2 (Current: 4.3.2 Latest: 5.5.0)
django-treebeard (Current: 3.0 Latest: 4.0)
 - used internally

python-swiftclient (Current: 2.6.0 Latest: 2.7.0)
oslo.utils (Current: 2.8.0 Latest: 3.3.0)
oslo.serialization (Current: 1.11.0 Latest: 2.2.0)
oslo.config (Current: 2.7.0 Latest: 3.2.0)
python-keystoneclient (Current: 1.3.3 Latest: 2.0.0)
oslo.i18n (Current: 2.7.0 Latest: 3.1.0)
 - unsure about these...

Django (Current: 1.8.8 Latest: 1.9.1)
 - some modules don't work with 1.9 yet

[lp:~dholbach/developer-ubuntu-com/django-cms-update]

166. By Daniel Holbach on 2016-01-06

update to newest, resolve conflicts

Unmerged revisions

=== modified file 'Makefile'
--- Makefile	2015-12-08 10:25:29 +0000
+++ Makefile	2016-01-06 12:35:04 +0000
@@ -14,8 +14,13 @@
 
 swift-perms:
 	@echo "Setting up Swift bucket permissions"
+<<<<<<< TREE
 	@if [ "${SWIFT_CONTAINER_NAME}" = "" ]; then echo "Using default upload container"; http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' devportal_uploaded; else http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' $(SWIFT_CONTAINER_NAME); fi
 	@if [ "${SWIFT_STATICCONTAINER_NAME}" = "" ]; then echo "Using default static container"; http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' devportal_static; else http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" swift post --read-acl '.r:*' $(SWIFT_STATICCONTAINER_NAME); fi
+=======
+	@if [ "${SWIFT_CONTAINER_NAME}" = "" ]; then echo "Using default upload container"; swift post --read-acl '.r:*' devportal_uploaded; else swift post --read-acl '.r:*' $(SWIFT_CONTAINER_NAME); fi
+	@if [ "${SWIFT_STATICCONTAINER_NAME}" = "" ]; then echo "Using default static container"; swift post --read-acl '.r:*' devportal_static; else swift post --read-acl '.r:*' $(SWIFT_STATICCONTAINER_NAME); fi
+>>>>>>> MERGE-SOURCE
 
 update-apidocs:
 	if [ $(DATABASE_URL) ]; then DJANGO_SETTINGS_MODULE=charm_settings ./update_apidocs.sh > ${PWD}/../../logs/update_apidocs.log 2>${PWD}/../../logs/update_apidocs_errors.log; fi
@@ -51,28 +56,36 @@
 collectstatic: collectstatic.done
 collectstatic.done:
 	@echo "Collecting static files"
+<<<<<<< TREE
 	@http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" python manage.py collectstatic -v 0 --noinput --settings charm_settings 2>/dev/null
+=======
+	@python manage.py collectstatic -v 0 --noinput --settings charm_settings 2>/dev/null
+>>>>>>> MERGE-SOURCE
 	@touch collectstatic.done
 
 collectstatic.debug:
 	@echo "Debugging output from collectstatic"
+<<<<<<< TREE
 	@http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" python manage.py collectstatic -v 1 --noinput --settings charm_settings
+=======
+	@python manage.py collectstatic -v 1 --noinput --settings charm_settings
+>>>>>>> MERGE-SOURCE
 
 update-pip-cache:
 	@echo "Updating pip-cache"
 	rm -rf pip-cache
-	bzr branch lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
+	bzr branch lp:developer-ubuntu-com/dependencies pip-cache
 	pip install --exists-action=w --download pip-cache/ -r requirements.txt
 	bzr add pip-cache/* 
 	bzr commit pip-cache/ -m 'automatically updated devportal requirements'
-	bzr push --directory pip-cache lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies
+	bzr push --directory pip-cache lp:developer-ubuntu-com/dependencies 
 	bzr revno pip-cache > pip-cache-revno.txt
 	rm -rf pip-cache
 	@echo "** Remember to commit pip-cache-revno.txt"
 
 pip-cache:
 	@echo "Downloading pip-cache"
-	@bzr branch -r `cat pip-cache-revno.txt` lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
+	@bzr branch -r `cat pip-cache-revno.txt` lp:developer-ubuntu-com/dependencies pip-cache
 
 env: pip-cache
 	@echo "Creating virtualenv"

=== modified file 'developer_portal/blog/views.py'
--- developer_portal/blog/views.py	2015-12-08 10:25:29 +0000
+++ developer_portal/blog/views.py	2016-01-06 12:35:04 +0000
@@ -43,7 +43,9 @@
         return super(MultiLangEntryYear, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryYear, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryMonth(MultiLangMixin, EntryMonth):
     def get(self, request, *args, **kwargs):
@@ -51,7 +53,9 @@
         return super(MultiLangEntryMonth, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryMonth, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryWeek(MultiLangMixin, EntryWeek):
     def get(self, request, *args, **kwargs):
@@ -59,7 +63,9 @@
         return super(MultiLangEntryWeek, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryWeek, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryDay(MultiLangMixin, EntryDay):
     def get(self, request, *args, **kwargs):
@@ -67,7 +73,9 @@
         return super(MultiLangEntryDay, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryDay, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryToday(MultiLangMixin, EntryToday):
     def get(self, request, *args, **kwargs):
@@ -75,4 +83,6 @@
         return super(MultiLangEntryToday, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryToday, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)

=== modified file 'developer_portal/management/commands/initdb.py'
--- developer_portal/management/commands/initdb.py	2015-12-08 10:25:29 +0000
+++ developer_portal/management/commands/initdb.py	2016-01-06 12:35:04 +0000
@@ -1,17 +1,12 @@
 #!/usr/bin/python
 
 from django.core.management.base import BaseCommand
-from optparse import make_option
-
 from django.conf import settings
 
-import subprocess
-import os
-import sys
-
-from django.contrib.auth.models import User, Group, Permission
-from django.contrib.contenttypes.models import ContentType
+from django.contrib.auth.models import User, Permission
 from cms.models.permissionmodels import PageUserGroup, GlobalPagePermission
+from zinnia.models import Category
+
 
 class Command(BaseCommand):
     help = "Make sure the Developer Portal database is set up properly."
@@ -20,24 +15,25 @@
 
         all_perms = Permission.objects.filter()
 
-        print "Creating admin user."
+        print("Creating admin user.")
         admin, created = User.objects.get_or_create(username='system')
         admin.is_staff = True
         admin.is_superuser = True
         admin.save()
 
         if hasattr(settings, 'ADMIN_GROUP') and settings.ADMIN_GROUP != "":
-            print "Configuring "+settings.ADMIN_GROUP+" group."
-            admins, created = PageUserGroup.objects.get_or_create(name=settings.ADMIN_GROUP, defaults={'created_by': admin})
+            print("Configuring {} group.".format(settings.ADMIN_GROUP))
+            admins, created = PageUserGroup.objects.get_or_create(
+                name=settings.ADMIN_GROUP, defaults={'created_by': admin})
             admins.permissions.add(*list(all_perms))
 
-            print "Configuring global permissions for group."
+            print("Configuring global permissions for group.")
             adminperms, created = GlobalPagePermission.objects.get_or_create(
                 # who:
-                group = admins,
+                group=admins,
 
                 # what:
-                defaults = {
+                defaults={
                     'can_change': True,
                     'can_add': True,
                     'can_delete': True,
@@ -51,18 +47,26 @@
             adminperms.sites.add(settings.SITE_ID)
 
         if hasattr(settings, 'EDITOR_GROUP') and settings.EDITOR_GROUP != "":
+<<<<<<< TREE
             print "Configuring "+settings.EDITOR_GROUP+" group."
             editors, created = PageUserGroup.objects.get_or_create(name=settings.EDITOR_GROUP, defaults={'created_by': admin})
             page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__name='page')
+=======
+            print("Configuring {} group.".format(settings.EDITOR_GROUP))
+            editors, created = PageUserGroup.objects.get_or_create(
+                name=settings.EDITOR_GROUP, defaults={'created_by': admin})
+            page_perms = Permission.objects.filter(
+                content_type__app_label='cms', content_type__model='page')
+>>>>>>> MERGE-SOURCE
             editors.permissions.add(*list(page_perms))
 
-            print "Configuring global permissions for group."
+            print("Configuring global permissions for group.")
             editorsperms, created = GlobalPagePermission.objects.get_or_create(
                 # who:
-                group = editors,
+                group=editors,
 
                 # what:
-                defaults = {
+                defaults={
                     'can_change': True,
                     'can_add': True,
                     'can_delete': True,
@@ -74,3 +78,11 @@
                 }
             )
             editorsperms.sites.add(settings.SITE_ID)
+
+        print('Adding zinnia categories for the following: {}.'.format(
+            ', '.join([a[0] for a in settings.LANGUAGES])))
+        for lang in settings.LANGUAGES:
+            if lang[1] == 'Simplified Chinese':
+                Category.objects.get_or_create(title='Chinese', slug=lang[0])
+            else:
+                Category.objects.get_or_create(title=lang[1], slug=lang[0])

=== modified file 'developer_portal/settings.py'
--- developer_portal/settings.py	2015-12-08 10:25:29 +0000
+++ developer_portal/settings.py	2016-01-06 12:35:04 +0000
@@ -290,11 +290,17 @@
         'toolbar': 'Zinnia',
     },
 }
+<<<<<<< TREE
 
 # Allow iframes in ckeditor
 TEXT_ADDITIONAL_TAGS = ('iframe',)
 TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
 
+=======
+TEXT_ADDITIONAL_TAGS = ('iframe',)
+TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
+
+>>>>>>> MERGE-SOURCE
 CMSPLUGIN_ZINNIA_APP_URLS = ['developer_portal.blog.urls']
 
 REST_FRAMEWORK = {
@@ -318,6 +324,26 @@
     #'PAGINATE_BY': 10,
 }
 
+<<<<<<< TREE
+=======
+MIGRATION_MODULES = {
+    'cms': 'cms.migrations',
+    'cmsplugin_zinnia': 'cmsplugin_zinnia.migrations',
+    'djangocms_link': 'djangocms_link.migrations',
+    'djangocms_picture': 'djangocms_picture.migrations',
+    'djangocms_snippet': 'djangocms_snippet.migrations',
+    'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations',
+    'djangocms_video': 'djangocms_video.migrations',
+    'django_comments': 'django_comments.migrations',
+    'menus': 'menus.migrations',
+    'rest_framework.authtoken': 'rest_framework.authtoken.migrations',
+    'reversion': 'reversion.migrations',
+    'tagging': 'tagging.migrations',
+    'taggit': 'taggit.migrations',
+    'zinnia': 'zinnia.migrations',
+}
+
+>>>>>>> MERGE-SOURCE
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,

=== modified file 'pip-cache-revno.txt'
--- pip-cache-revno.txt	2015-12-08 10:25:29 +0000
+++ pip-cache-revno.txt	2016-01-06 12:35:04 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 14
+=======
+18
+>>>>>>> MERGE-SOURCE

=== modified file 'requirements.txt'
--- requirements.txt	2015-12-08 10:25:29 +0000
+++ requirements.txt	2016-01-06 12:35:04 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 oslo.config==1.6.0
 oslo.i18n==1.2.0
 oslo.serialization==1.2.0
@@ -8,12 +9,25 @@
 Pillow==2.6.1
 beautifulsoup4==4.4.0
 cmsplugin-zinnia==0.6
+=======
+Django==1.8.8
+django-template-debug==0.3.5
+oslo.config==3.1.0
+oslo.i18n==3.1.0
+oslo.serialization==2.1.0
+oslo.utils==3.2.0
+Pillow==2.9.0
+cmsplugin-zinnia==0.8
+Markdown==2.6.5
+beautifulsoup4==4.4.1
+>>>>>>> MERGE-SOURCE
 dj-database-url==0.3.0
 django-admin-enhancer==0.1.3.1
 django-appconf==0.6
 django-blog-zinnia==0.14.2
 django-ckeditor==4.4.7
 django-ckeditor-updated==4.4.4
+<<<<<<< TREE
 django-classy-tags==0.5.1
 django-cms==3.0.6
 django-contrib-comments==1.5
@@ -25,29 +39,68 @@
 django-polymorphic==0.6
 django-reversion==1.8.4
 django-sekizai==0.7
+=======
+django-classy-tags==0.7.0
+django-cms==3.2.0
+django-contrib-comments==1.6.2
+django-meta==0.3.1
+django-meta-mixin==0.2.1
+django-missing==0.1.15
+django-parler==1.6
+django-polymorphic==0.8.1
+django-reversion==1.9.3
+django-sekizai==0.9.0
+>>>>>>> MERGE-SOURCE
 django-swiftstorage==1.1.0
+<<<<<<< TREE
 django-tagging==0.3.3
 django-taggit==0.12.2
 django-taggit-autosuggest==0.2.5
+=======
+django-tagging==0.4
+django-taggit==0.17.6
+django-taggit-autosuggest==0.2.8
+>>>>>>> MERGE-SOURCE
 django-taggit-templatetags==0.2.5
 django-templatetag-sugar==1.0
 django-xmlrpc==0.1.5
+<<<<<<< TREE
 djangocms-admin-style==0.2.2
 djangocms-link==1.5
 djangocms-picture==0.1
 djangocms-snippet==1.3
 djangocms-text-ckeditor==2.4.2
+=======
+djangocms-admin-style==1.0.8
+djangocms-link==1.7.1
+djangocms-picture==0.2.0
+djangocms-snippet==1.7.1
+djangocms-text-ckeditor==2.8.1
+>>>>>>> MERGE-SOURCE
 djangocms-utils==0.9.5
+<<<<<<< TREE
 djangocms-video==0.1
 python-keystoneclient==0.11.2
 python-swiftclient==2.3.1
 pytz==2014.7
+=======
+djangocms-video==0.2.0
+python-keystoneclient==1.3.3
+python-swiftclient==2.6.0
+pytz==2015.7
+>>>>>>> MERGE-SOURCE
 simple-translation==0.8.6
 simplejson==3.6.5
 wsgiref==0.1.2
 zinnia-wysiwyg-ckeditor==1.1
 Pygments==1.6
 django-pygments==0.1
+<<<<<<< TREE
 django-openid-auth==0.5
 python-openid==2.2.4
 djangorestframework==3.0.4
+=======
+django-openid-auth==0.7
+python-openid==2.2.5
+djangorestframework==3.3.2
+>>>>>>> MERGE-SOURCE