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

[Daniel Holbach]

Update pip components to newest.

[lp:~dholbach/ubucon-site/update]

40. By Daniel Holbach on 2016-04-05

update docs

[Michael Hall (mhall119)]

LGTM

review: Approve

=== 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 @@
+# libxml2-dev and libxslt-dev for aldryn-newsblog, which wants lxml
 sudo apt install virtualenv libxml2-dev libxslt-dev 
 
 # Enable DATABASE in ubucon_site/settings/__init__.py

=== 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 @@
 aldryn-newsblog==1.2.1
-Django==1.7.1
-Django-Select2==4.3.1
-Pillow==2.9.0
 argparse==1.2.1
-dj-database-url==0.3.0
-django-classy-tags==0.6.2
-django-cms==3.1.2
-django-mptt==0.7.4
-django-openid-auth==0.5
-django-reversion==1.8.5
-django-sekizai==0.8.2
-django-treebeard==3.0
-djangocms-admin-style==0.2.7
-djangocms-column==1.5
-djangocms-file==0.1
-djangocms-flash==0.2.0
-djangocms-googlemap==0.3
-djangocms-inherit==0.1
+Django==1.8.11
+django-classy-tags==0.7.2
+django-cms==3.2.3
+djangocms-admin-style==1.1.0
+djangocms-column==1.6.0
+djangocms-file==1.0
+djangocms-flash==0.3.0
+djangocms-googlemap==0.4.0
+djangocms-inherit==0.1.1
 djangocms-installer==0.7.9
-djangocms-link==1.6.2
-djangocms-picture==0.1
-djangocms-style==1.5
-djangocms-teaser==0.1
-djangocms-text-ckeditor==2.7.0
-djangocms-video==0.1
+djangocms-link==1.7.2
+djangocms-picture==1.0.0
+djangocms-style==1.7.0
+djangocms-teaser==0.2.0
+djangocms-text-ckeditor==2.9.1
+djangocms-video==1.0.0
+django-mptt==0.8.3
+django-openid-auth==0.7
+django-reversion==1.10.1
+django-sekizai==0.9.0
+Django-Select2==5.8.4
+django-treebeard==4.0
+dj-database-url==0.4.0
+dj-static==0.0.6
 html5lib==0.999999
+Pillow==3.1.1
 python-openid==2.2.5
-pytz==2015.4
-six==1.9.0
-tzlocal==1.2
-dj-static==0.0.6
+pytz==2016.3
+six==1.10.0
+tzlocal==1.2.2
 wsgiref==0.1.2

=== 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 @@
 
 SITE_ID = 1
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+                'django.core.context_processors.i18n',
+                'django.core.context_processors.debug',
+                'django.core.context_processors.request',
+                'django.core.context_processors.media',
+                'django.core.context_processors.csrf',
+                'django.core.context_processors.tz',
+                'sekizai.context_processors.sekizai',
+                'django.core.context_processors.static',
+                'cms.context_processors.cms_settings',
+                # For Aldryn
+                'aldryn_boilerplates.context_processors.boilerplate',
+            ],
+        },
+    },
+]
+
+
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'aldryn_boilerplates.template_loaders.AppDirectoriesLoader',
@@ -87,25 +116,6 @@
     'django.template.loaders.eggs.Loader'
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.contrib.messages.context_processors.messages',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.request',
-    'django.core.context_processors.media',
-    'django.core.context_processors.csrf',
-    'django.core.context_processors.tz',
-    'sekizai.context_processors.sekizai',
-    'django.core.context_processors.static',
-    'cms.context_processors.cms_settings',
-    # For Aldryn
-    'aldryn_boilerplates.context_processors.boilerplate',
-)
-
-TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, 'templates'),
-)
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',