UbuCon site

Merge lp:~dholbach/ubucon-site/update into lp:ubucon-site

  1. update
  2. Merge into production
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 40
Proposed branch: lp:~dholbach/ubucon-site/update
Merge into: lp:ubucon-site
Prerequisite: lp:~dholbach/ubucon-site/newsblog
Diff against target: 139 lines (+57/-46)
3 files modified
README.local.md (+1/-0)
ubucon_site/requirements.txt (+27/-27)
ubucon_site/settings/__init__.py (+29/-19)
To merge this branch: bzr merge lp:~dholbach/ubucon-site/update
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+290403@code.launchpad.net

Commit message

Update pip components to newest.

To post a comment you must log in.
lp:~dholbach/ubucon-site/update updated
40. By Daniel Holbach

update docs

Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README.local.md'
--- README.local.md 2016-04-05 13:58:43 +0000
+++ README.local.md 2016-04-05 13:58:43 +0000
@@ -1,3 +1,4 @@
1# libxml2-dev and libxslt-dev for aldryn-newsblog, which wants lxml
1sudo apt install virtualenv libxml2-dev libxslt-dev 2sudo apt install virtualenv libxml2-dev libxslt-dev
23
3# Enable DATABASE in ubucon_site/settings/__init__.py4# Enable DATABASE in ubucon_site/settings/__init__.py
45
=== modified file 'ubucon_site/requirements.txt'
--- ubucon_site/requirements.txt 2016-04-05 13:58:43 +0000
+++ ubucon_site/requirements.txt 2016-04-05 13:58:43 +0000
@@ -1,33 +1,33 @@
1aldryn-newsblog==1.2.11aldryn-newsblog==1.2.1
2Django==1.7.1
3Django-Select2==4.3.1
4Pillow==2.9.0
5argparse==1.2.12argparse==1.2.1
6dj-database-url==0.3.03Django==1.8.11
7django-classy-tags==0.6.24django-classy-tags==0.7.2
8django-cms==3.1.25django-cms==3.2.3
9django-mptt==0.7.46djangocms-admin-style==1.1.0
10django-openid-auth==0.57djangocms-column==1.6.0
11django-reversion==1.8.58djangocms-file==1.0
12django-sekizai==0.8.29djangocms-flash==0.3.0
13django-treebeard==3.010djangocms-googlemap==0.4.0
14djangocms-admin-style==0.2.711djangocms-inherit==0.1.1
15djangocms-column==1.5
16djangocms-file==0.1
17djangocms-flash==0.2.0
18djangocms-googlemap==0.3
19djangocms-inherit==0.1
20djangocms-installer==0.7.912djangocms-installer==0.7.9
21djangocms-link==1.6.213djangocms-link==1.7.2
22djangocms-picture==0.114djangocms-picture==1.0.0
23djangocms-style==1.515djangocms-style==1.7.0
24djangocms-teaser==0.116djangocms-teaser==0.2.0
25djangocms-text-ckeditor==2.7.017djangocms-text-ckeditor==2.9.1
26djangocms-video==0.118djangocms-video==1.0.0
19django-mptt==0.8.3
20django-openid-auth==0.7
21django-reversion==1.10.1
22django-sekizai==0.9.0
23Django-Select2==5.8.4
24django-treebeard==4.0
25dj-database-url==0.4.0
26dj-static==0.0.6
27html5lib==0.99999927html5lib==0.999999
28Pillow==3.1.1
28python-openid==2.2.529python-openid==2.2.5
29pytz==2015.430pytz==2016.3
30six==1.9.031six==1.10.0
31tzlocal==1.232tzlocal==1.2.2
32dj-static==0.0.6
33wsgiref==0.1.233wsgiref==0.1.2
3434
=== modified file 'ubucon_site/settings/__init__.py'
--- ubucon_site/settings/__init__.py 2016-04-05 13:58:43 +0000
+++ ubucon_site/settings/__init__.py 2016-04-05 13:58:43 +0000
@@ -80,6 +80,35 @@
8080
81SITE_ID = 181SITE_ID = 1
8282
83TEMPLATES = [
84 {
85 'BACKEND': 'django.template.backends.django.DjangoTemplates',
86 'DIRS': [
87 os.path.join(BASE_DIR, 'templates'),
88 ],
89 'APP_DIRS': True,
90 'OPTIONS': {
91 'context_processors': [
92 'django.template.context_processors.request',
93 'django.contrib.auth.context_processors.auth',
94 'django.contrib.messages.context_processors.messages',
95 'django.core.context_processors.i18n',
96 'django.core.context_processors.debug',
97 'django.core.context_processors.request',
98 'django.core.context_processors.media',
99 'django.core.context_processors.csrf',
100 'django.core.context_processors.tz',
101 'sekizai.context_processors.sekizai',
102 'django.core.context_processors.static',
103 'cms.context_processors.cms_settings',
104 # For Aldryn
105 'aldryn_boilerplates.context_processors.boilerplate',
106 ],
107 },
108 },
109]
110
111
83TEMPLATE_LOADERS = (112TEMPLATE_LOADERS = (
84 'django.template.loaders.filesystem.Loader',113 'django.template.loaders.filesystem.Loader',
85 'aldryn_boilerplates.template_loaders.AppDirectoriesLoader',114 'aldryn_boilerplates.template_loaders.AppDirectoriesLoader',
@@ -87,25 +116,6 @@
87 'django.template.loaders.eggs.Loader'116 'django.template.loaders.eggs.Loader'
88)117)
89118
90TEMPLATE_CONTEXT_PROCESSORS = (
91 'django.contrib.auth.context_processors.auth',
92 'django.contrib.messages.context_processors.messages',
93 'django.core.context_processors.i18n',
94 'django.core.context_processors.debug',
95 'django.core.context_processors.request',
96 'django.core.context_processors.media',
97 'django.core.context_processors.csrf',
98 'django.core.context_processors.tz',
99 'sekizai.context_processors.sekizai',
100 'django.core.context_processors.static',
101 'cms.context_processors.cms_settings',
102 # For Aldryn
103 'aldryn_boilerplates.context_processors.boilerplate',
104)
105
106TEMPLATE_DIRS = (
107 os.path.join(BASE_DIR, 'templates'),
108)
109119
110MIDDLEWARE_CLASSES = (120MIDDLEWARE_CLASSES = (
111 'django.contrib.sessions.middleware.SessionMiddleware',121 'django.contrib.sessions.middleware.SessionMiddleware',

Subscribers

People subscribed via source and target branches