Ubuntu Developer Portal

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

  1. django-cms-update
  2. Merge into stable
Proposed by Daniel Holbach on 2015-11-24
Status: Superseded
Proposed branch: lp:~dholbach/developer-ubuntu-com/django-cms-update
Merge into: lp:developer-ubuntu-com
Diff against target: 375 lines (+143/-25) (has conflicts)
6 files modified
Makefile (+16/-3)
developer_portal/blog/views.py (+15/-5)
developer_portal/management/commands/initdb.py (+29/-17)
developer_portal/settings.py (+26/-0)
pip-cache-revno.txt (+4/-0)
requirements.txt (+53/-0)
Text conflict in Makefile
Text conflict in developer_portal/management/commands/initdb.py
Text conflict in developer_portal/settings.py
Text conflict in pip-cache-revno.txt
Text conflict in requirements.txt
To merge this branch: bzr merge lp:~dholbach/developer-ubuntu-com/django-cms-update
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers 2015-11-24 Pending
Review via email: mp+278447@code.launchpad.net

This proposal has been superseded by a proposal from 2016-01-06.

To post a comment you must log in.
lp:~dholbach/developer-ubuntu-com/django-cms-update updated on 2015-12-15
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) wrote :

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 updated on 2016-01-06
166. By Daniel Holbach on 2016-01-06

update to newest, resolve conflicts

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-12-08 10:25:29 +0000
3+++ Makefile 2016-01-06 12:35:04 +0000
4@@ -14,8 +14,13 @@
5
6 swift-perms:
7 @echo "Setting up Swift bucket permissions"
8+<<<<<<< TREE
9 @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
10 @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
11+=======
12+ @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
13+ @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
14+>>>>>>> MERGE-SOURCE
15
16 update-apidocs:
17 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
18@@ -51,28 +56,36 @@
19 collectstatic: collectstatic.done
20 collectstatic.done:
21 @echo "Collecting static files"
22+<<<<<<< TREE
23 @http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" python manage.py collectstatic -v 0 --noinput --settings charm_settings 2>/dev/null
24+=======
25+ @python manage.py collectstatic -v 0 --noinput --settings charm_settings 2>/dev/null
26+>>>>>>> MERGE-SOURCE
27 @touch collectstatic.done
28
29 collectstatic.debug:
30 @echo "Debugging output from collectstatic"
31+<<<<<<< TREE
32 @http_proxy="${swift_proxy}" https_proxy="${swift_proxy}" python manage.py collectstatic -v 1 --noinput --settings charm_settings
33+=======
34+ @python manage.py collectstatic -v 1 --noinput --settings charm_settings
35+>>>>>>> MERGE-SOURCE
36
37 update-pip-cache:
38 @echo "Updating pip-cache"
39 rm -rf pip-cache
40- bzr branch lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
41+ bzr branch lp:developer-ubuntu-com/dependencies pip-cache
42 pip install --exists-action=w --download pip-cache/ -r requirements.txt
43 bzr add pip-cache/*
44 bzr commit pip-cache/ -m 'automatically updated devportal requirements'
45- bzr push --directory pip-cache lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies
46+ bzr push --directory pip-cache lp:developer-ubuntu-com/dependencies
47 bzr revno pip-cache > pip-cache-revno.txt
48 rm -rf pip-cache
49 @echo "** Remember to commit pip-cache-revno.txt"
50
51 pip-cache:
52 @echo "Downloading pip-cache"
53- @bzr branch -r `cat pip-cache-revno.txt` lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
54+ @bzr branch -r `cat pip-cache-revno.txt` lp:developer-ubuntu-com/dependencies pip-cache
55
56 env: pip-cache
57 @echo "Creating virtualenv"
58
59=== modified file 'developer_portal/blog/views.py'
60--- developer_portal/blog/views.py 2015-12-08 10:25:29 +0000
61+++ developer_portal/blog/views.py 2016-01-06 12:35:04 +0000
62@@ -43,7 +43,9 @@
63 return super(MultiLangEntryYear, self).get(request, *args, **kwargs)
64
65 def get_dated_queryset(self, ordering=None, **lookup):
66- return super(MultiLangEntryYear, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
67+ if ordering:
68+ return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
69+ return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
70
71 class MultiLangEntryMonth(MultiLangMixin, EntryMonth):
72 def get(self, request, *args, **kwargs):
73@@ -51,7 +53,9 @@
74 return super(MultiLangEntryMonth, self).get(request, *args, **kwargs)
75
76 def get_dated_queryset(self, ordering=None, **lookup):
77- return super(MultiLangEntryMonth, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
78+ if ordering:
79+ return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
80+ return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
81
82 class MultiLangEntryWeek(MultiLangMixin, EntryWeek):
83 def get(self, request, *args, **kwargs):
84@@ -59,7 +63,9 @@
85 return super(MultiLangEntryWeek, self).get(request, *args, **kwargs)
86
87 def get_dated_queryset(self, ordering=None, **lookup):
88- return super(MultiLangEntryWeek, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
89+ if ordering:
90+ return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
91+ return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
92
93 class MultiLangEntryDay(MultiLangMixin, EntryDay):
94 def get(self, request, *args, **kwargs):
95@@ -67,7 +73,9 @@
96 return super(MultiLangEntryDay, self).get(request, *args, **kwargs)
97
98 def get_dated_queryset(self, ordering=None, **lookup):
99- return super(MultiLangEntryDay, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
100+ if ordering:
101+ return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
102+ return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
103
104 class MultiLangEntryToday(MultiLangMixin, EntryToday):
105 def get(self, request, *args, **kwargs):
106@@ -75,4 +83,6 @@
107 return super(MultiLangEntryToday, self).get(request, *args, **kwargs)
108
109 def get_dated_queryset(self, ordering=None, **lookup):
110- return super(MultiLangEntryToday, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
111+ if ordering:
112+ return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
113+ return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
114
115=== modified file 'developer_portal/management/commands/initdb.py'
116--- developer_portal/management/commands/initdb.py 2015-12-08 10:25:29 +0000
117+++ developer_portal/management/commands/initdb.py 2016-01-06 12:35:04 +0000
118@@ -1,17 +1,12 @@
119 #!/usr/bin/python
120
121 from django.core.management.base import BaseCommand
122-from optparse import make_option
123-
124 from django.conf import settings
125
126-import subprocess
127-import os
128-import sys
129-
130-from django.contrib.auth.models import User, Group, Permission
131-from django.contrib.contenttypes.models import ContentType
132+from django.contrib.auth.models import User, Permission
133 from cms.models.permissionmodels import PageUserGroup, GlobalPagePermission
134+from zinnia.models import Category
135+
136
137 class Command(BaseCommand):
138 help = "Make sure the Developer Portal database is set up properly."
139@@ -20,24 +15,25 @@
140
141 all_perms = Permission.objects.filter()
142
143- print "Creating admin user."
144+ print("Creating admin user.")
145 admin, created = User.objects.get_or_create(username='system')
146 admin.is_staff = True
147 admin.is_superuser = True
148 admin.save()
149
150 if hasattr(settings, 'ADMIN_GROUP') and settings.ADMIN_GROUP != "":
151- print "Configuring "+settings.ADMIN_GROUP+" group."
152- admins, created = PageUserGroup.objects.get_or_create(name=settings.ADMIN_GROUP, defaults={'created_by': admin})
153+ print("Configuring {} group.".format(settings.ADMIN_GROUP))
154+ admins, created = PageUserGroup.objects.get_or_create(
155+ name=settings.ADMIN_GROUP, defaults={'created_by': admin})
156 admins.permissions.add(*list(all_perms))
157
158- print "Configuring global permissions for group."
159+ print("Configuring global permissions for group.")
160 adminperms, created = GlobalPagePermission.objects.get_or_create(
161 # who:
162- group = admins,
163+ group=admins,
164
165 # what:
166- defaults = {
167+ defaults={
168 'can_change': True,
169 'can_add': True,
170 'can_delete': True,
171@@ -51,18 +47,26 @@
172 adminperms.sites.add(settings.SITE_ID)
173
174 if hasattr(settings, 'EDITOR_GROUP') and settings.EDITOR_GROUP != "":
175+<<<<<<< TREE
176 print "Configuring "+settings.EDITOR_GROUP+" group."
177 editors, created = PageUserGroup.objects.get_or_create(name=settings.EDITOR_GROUP, defaults={'created_by': admin})
178 page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__name='page')
179+=======
180+ print("Configuring {} group.".format(settings.EDITOR_GROUP))
181+ editors, created = PageUserGroup.objects.get_or_create(
182+ name=settings.EDITOR_GROUP, defaults={'created_by': admin})
183+ page_perms = Permission.objects.filter(
184+ content_type__app_label='cms', content_type__model='page')
185+>>>>>>> MERGE-SOURCE
186 editors.permissions.add(*list(page_perms))
187
188- print "Configuring global permissions for group."
189+ print("Configuring global permissions for group.")
190 editorsperms, created = GlobalPagePermission.objects.get_or_create(
191 # who:
192- group = editors,
193+ group=editors,
194
195 # what:
196- defaults = {
197+ defaults={
198 'can_change': True,
199 'can_add': True,
200 'can_delete': True,
201@@ -74,3 +78,11 @@
202 }
203 )
204 editorsperms.sites.add(settings.SITE_ID)
205+
206+ print('Adding zinnia categories for the following: {}.'.format(
207+ ', '.join([a[0] for a in settings.LANGUAGES])))
208+ for lang in settings.LANGUAGES:
209+ if lang[1] == 'Simplified Chinese':
210+ Category.objects.get_or_create(title='Chinese', slug=lang[0])
211+ else:
212+ Category.objects.get_or_create(title=lang[1], slug=lang[0])
213
214=== modified file 'developer_portal/settings.py'
215--- developer_portal/settings.py 2015-12-08 10:25:29 +0000
216+++ developer_portal/settings.py 2016-01-06 12:35:04 +0000
217@@ -290,11 +290,17 @@
218 'toolbar': 'Zinnia',
219 },
220 }
221+<<<<<<< TREE
222
223 # Allow iframes in ckeditor
224 TEXT_ADDITIONAL_TAGS = ('iframe',)
225 TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
226
227+=======
228+TEXT_ADDITIONAL_TAGS = ('iframe',)
229+TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
230+
231+>>>>>>> MERGE-SOURCE
232 CMSPLUGIN_ZINNIA_APP_URLS = ['developer_portal.blog.urls']
233
234 REST_FRAMEWORK = {
235@@ -318,6 +324,26 @@
236 #'PAGINATE_BY': 10,
237 }
238
239+<<<<<<< TREE
240+=======
241+MIGRATION_MODULES = {
242+ 'cms': 'cms.migrations',
243+ 'cmsplugin_zinnia': 'cmsplugin_zinnia.migrations',
244+ 'djangocms_link': 'djangocms_link.migrations',
245+ 'djangocms_picture': 'djangocms_picture.migrations',
246+ 'djangocms_snippet': 'djangocms_snippet.migrations',
247+ 'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations',
248+ 'djangocms_video': 'djangocms_video.migrations',
249+ 'django_comments': 'django_comments.migrations',
250+ 'menus': 'menus.migrations',
251+ 'rest_framework.authtoken': 'rest_framework.authtoken.migrations',
252+ 'reversion': 'reversion.migrations',
253+ 'tagging': 'tagging.migrations',
254+ 'taggit': 'taggit.migrations',
255+ 'zinnia': 'zinnia.migrations',
256+}
257+
258+>>>>>>> MERGE-SOURCE
259 LOGGING = {
260 'version': 1,
261 'disable_existing_loggers': False,
262
263=== modified file 'pip-cache-revno.txt'
264--- pip-cache-revno.txt 2015-12-08 10:25:29 +0000
265+++ pip-cache-revno.txt 2016-01-06 12:35:04 +0000
266@@ -1,1 +1,5 @@
267+<<<<<<< TREE
268 14
269+=======
270+18
271+>>>>>>> MERGE-SOURCE
272
273=== modified file 'requirements.txt'
274--- requirements.txt 2015-12-08 10:25:29 +0000
275+++ requirements.txt 2016-01-06 12:35:04 +0000
276@@ -1,3 +1,4 @@
277+<<<<<<< TREE
278 oslo.config==1.6.0
279 oslo.i18n==1.2.0
280 oslo.serialization==1.2.0
281@@ -8,12 +9,25 @@
282 Pillow==2.6.1
283 beautifulsoup4==4.4.0
284 cmsplugin-zinnia==0.6
285+=======
286+Django==1.8.8
287+django-template-debug==0.3.5
288+oslo.config==3.1.0
289+oslo.i18n==3.1.0
290+oslo.serialization==2.1.0
291+oslo.utils==3.2.0
292+Pillow==2.9.0
293+cmsplugin-zinnia==0.8
294+Markdown==2.6.5
295+beautifulsoup4==4.4.1
296+>>>>>>> MERGE-SOURCE
297 dj-database-url==0.3.0
298 django-admin-enhancer==0.1.3.1
299 django-appconf==0.6
300 django-blog-zinnia==0.14.2
301 django-ckeditor==4.4.7
302 django-ckeditor-updated==4.4.4
303+<<<<<<< TREE
304 django-classy-tags==0.5.1
305 django-cms==3.0.6
306 django-contrib-comments==1.5
307@@ -25,29 +39,68 @@
308 django-polymorphic==0.6
309 django-reversion==1.8.4
310 django-sekizai==0.7
311+=======
312+django-classy-tags==0.7.0
313+django-cms==3.2.0
314+django-contrib-comments==1.6.2
315+django-meta==0.3.1
316+django-meta-mixin==0.2.1
317+django-missing==0.1.15
318+django-parler==1.6
319+django-polymorphic==0.8.1
320+django-reversion==1.9.3
321+django-sekizai==0.9.0
322+>>>>>>> MERGE-SOURCE
323 django-swiftstorage==1.1.0
324+<<<<<<< TREE
325 django-tagging==0.3.3
326 django-taggit==0.12.2
327 django-taggit-autosuggest==0.2.5
328+=======
329+django-tagging==0.4
330+django-taggit==0.17.6
331+django-taggit-autosuggest==0.2.8
332+>>>>>>> MERGE-SOURCE
333 django-taggit-templatetags==0.2.5
334 django-templatetag-sugar==1.0
335 django-xmlrpc==0.1.5
336+<<<<<<< TREE
337 djangocms-admin-style==0.2.2
338 djangocms-link==1.5
339 djangocms-picture==0.1
340 djangocms-snippet==1.3
341 djangocms-text-ckeditor==2.4.2
342+=======
343+djangocms-admin-style==1.0.8
344+djangocms-link==1.7.1
345+djangocms-picture==0.2.0
346+djangocms-snippet==1.7.1
347+djangocms-text-ckeditor==2.8.1
348+>>>>>>> MERGE-SOURCE
349 djangocms-utils==0.9.5
350+<<<<<<< TREE
351 djangocms-video==0.1
352 python-keystoneclient==0.11.2
353 python-swiftclient==2.3.1
354 pytz==2014.7
355+=======
356+djangocms-video==0.2.0
357+python-keystoneclient==1.3.3
358+python-swiftclient==2.6.0
359+pytz==2015.7
360+>>>>>>> MERGE-SOURCE
361 simple-translation==0.8.6
362 simplejson==3.6.5
363 wsgiref==0.1.2
364 zinnia-wysiwyg-ckeditor==1.1
365 Pygments==1.6
366 django-pygments==0.1
367+<<<<<<< TREE
368 django-openid-auth==0.5
369 python-openid==2.2.4
370 djangorestframework==3.0.4
371+=======
372+django-openid-auth==0.7
373+python-openid==2.2.5
374+djangorestframework==3.3.2
375+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches