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