Merge pull request #6 from tmslav/update_django_version
Update django version
This commit is contained in:
commit
062afb392f
29 changed files with 191 additions and 83 deletions
|
@ -41,7 +41,7 @@ configure the values for the ssh host, user, port and target directory.
|
|||
Run:
|
||||
|
||||
$ python manage.py makemigratoins
|
||||
$ python manage.py syncdb
|
||||
$ python manage.py migrate
|
||||
|
||||
7. Setup a circus configuration.
|
||||
|
||||
|
|
19
digitalglarus/migrations/0010_auto_20160229_2106.py
Normal file
19
digitalglarus/migrations/0010_auto_20160229_2106.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('digitalglarus', '0009_remove_dgsupportersplugin_dgsupporters'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='message',
|
||||
name='email',
|
||||
field=models.EmailField(max_length=254),
|
||||
),
|
||||
]
|
|
@ -5,7 +5,9 @@ Copyright 2015 ungleich.
|
|||
# -*- coding: utf-8 -*-
|
||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||
import os
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
# dotenv
|
||||
import dotenv
|
||||
|
||||
|
@ -15,6 +17,7 @@ gettext = lambda s: s
|
|||
def env(env_name):
|
||||
return os.environ.get(env_name)
|
||||
|
||||
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
PROJECT_DIR = os.path.abspath(
|
||||
|
@ -122,6 +125,12 @@ TEMPLATES = [
|
|||
'django.template.context_processors.request',
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
"django.core.context_processors.media",
|
||||
"django.core.context_processors.static",
|
||||
"django.core.context_processors.tz",
|
||||
"django.contrib.messages.context_processors.messages",
|
||||
'sekizai.context_processors.sekizai',
|
||||
'cms.context_processors.cms_settings',
|
||||
],
|
||||
},
|
||||
},
|
||||
|
@ -129,33 +138,12 @@ TEMPLATES = [
|
|||
|
||||
WSGI_APPLICATION = 'dynamicweb.wsgi.application'
|
||||
|
||||
# Deprecated since version 1.8.
|
||||
# callables take a request object as their argument and return a dictionary of
|
||||
# items to be merged into the context.
|
||||
TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
"django.contrib.auth.context_processors.auth",
|
||||
"django.core.context_processors.debug",
|
||||
"django.core.context_processors.i18n",
|
||||
"django.core.context_processors.media",
|
||||
"django.core.context_processors.static",
|
||||
"django.core.context_processors.tz",
|
||||
"django.contrib.messages.context_processors.messages",
|
||||
"django.core.context_processors.request",
|
||||
'sekizai.context_processors.sekizai',
|
||||
'cms.context_processors.cms_settings',
|
||||
)
|
||||
|
||||
TEMPLATE_DIRS = (
|
||||
os.path.join(PROJECT_DIR, 'templates'),
|
||||
)
|
||||
TDIR = os.path.join(PROJECT_DIR, 'templates')
|
||||
|
||||
CMS_TEMPLATES_DIR = {
|
||||
1: os.path.join(TEMPLATE_DIRS[0], 'cms/'),
|
||||
1: os.path.join(TDIR, '')
|
||||
}
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
|
@ -273,17 +261,12 @@ MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
|
|||
MEDIA_URL = APP_ROOT_ENDPOINT + 'media/'
|
||||
FILE_UPLOAD_PERMISSIONS = 0o644
|
||||
|
||||
# Templates confs
|
||||
TEMPLATE_DIRS = (
|
||||
os.path.join(PROJECT_DIR, "templates"),
|
||||
)
|
||||
|
||||
META_SITE_PROTOCOL = 'http'
|
||||
META_USE_SITES = True
|
||||
|
||||
MIGRATION_MODULES = {
|
||||
'cms': 'cms.migrations',
|
||||
'filer': 'filer.migrations_django',
|
||||
# 'filer': 'filer.migrations_django',
|
||||
'menus': 'menus.migrations_django',
|
||||
'djangocms_flash': 'djangocms_flash.migrations_django',
|
||||
'djangocms_googlemap': 'djangocms_googlemap.migrations_django',
|
||||
|
@ -420,4 +403,4 @@ META_INCLUDE_KEYWORDS = ["ungleich", "hosting", "switzerland",
|
|||
"Schweiz", "Swiss", "cdist"]
|
||||
META_USE_SITES = True
|
||||
|
||||
PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'}, )}
|
||||
PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'},)}
|
||||
|
|
|
@ -4,12 +4,12 @@ ALLOWED_HOSTS = [
|
|||
"*"
|
||||
]
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': 'app.db',
|
||||
}
|
||||
}
|
||||
# DATABASES = {
|
||||
# 'default': {
|
||||
# 'ENGINE': 'django.db.backends.sqlite3',
|
||||
# 'NAME': 'app.db',
|
||||
# }
|
||||
# }
|
||||
|
||||
CACHES = {
|
||||
'default': {
|
||||
|
|
|
@ -8,20 +8,20 @@ from django.conf import settings
|
|||
from hosting.views import railshosting
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
|
||||
url(r'^railshosting/', railshosting, name="rails.hosting"),
|
||||
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
|
||||
url(r'^jsi18n/(?P<packages>\S+?)/$',
|
||||
'django.views.i18n.javascript_catalog'),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
|
||||
url(r'^railshosting/', railshosting, name="rails.hosting"),
|
||||
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
|
||||
url(r'^jsi18n/(?P<packages>\S+?)/$',
|
||||
'django.views.i18n.javascript_catalog'),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
||||
# note the django CMS URLs included via i18n_patterns
|
||||
urlpatterns += i18n_patterns('',
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url(r'^digitalglarus/', include('digitalglarus.urls',
|
||||
namespace="digitalglarus")),
|
||||
url(r'^', include('cms.urls')),
|
||||
)
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url(r'^digitalglarus/', include('digitalglarus.urls',
|
||||
namespace="digitalglarus")),
|
||||
url(r'^', include('cms.urls')),
|
||||
)
|
||||
|
||||
if settings.DEBUG:
|
||||
urlpatterns += patterns('',
|
||||
|
|
42
pg_upgrade_internal.log
Normal file
42
pg_upgrade_internal.log
Normal file
|
@ -0,0 +1,42 @@
|
|||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:55:31 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You must identify the directory where the old cluster binaries reside.
|
||||
Please use the -b command-line option or the PGBINOLD environment variable.
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:09 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You must identify the directory where the old cluster binaries reside.
|
||||
Please use the -b command-line option or the PGBINOLD environment variable.
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:22 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You must identify the directory where the old cluster binaries reside.
|
||||
Please use the -b command-line option or the PGBINOLD environment variable.
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:25 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You must identify the directory where the old cluster binaries reside.
|
||||
Please use the -b command-line option or the PGBINOLD environment variable.
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:32 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You must identify the directory where the old cluster binaries reside.
|
||||
Please use the -b command-line option or the PGBINOLD environment variable.
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Tue Mar 1 20:46:31 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You must identify the directory where the old cluster binaries reside.
|
||||
Please use the -b command-line option or the PGBINOLD environment variable.
|
30
pg_upgrade_server.log
Normal file
30
pg_upgrade_server.log
Normal file
|
@ -0,0 +1,30 @@
|
|||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:55:31 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:09 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:22 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:25 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:32 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Tue Mar 1 20:46:31 2016
|
||||
-----------------------------------------------------------------
|
||||
|
30
pg_upgrade_utility.log
Normal file
30
pg_upgrade_utility.log
Normal file
|
@ -0,0 +1,30 @@
|
|||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:55:31 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:09 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:22 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:25 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Mon Feb 29 11:56:32 2016
|
||||
-----------------------------------------------------------------
|
||||
|
||||
|
||||
-----------------------------------------------------------------
|
||||
pg_upgrade run on Tue Mar 1 20:46:31 2016
|
||||
-----------------------------------------------------------------
|
||||
|
|
@ -1,59 +1,51 @@
|
|||
Django==1.7.10
|
||||
Django-Select2==5.0.2
|
||||
Mako==1.0.2
|
||||
Markdown==2.6.2
|
||||
MarkupSafe==0.23
|
||||
Pillow==2.9.0
|
||||
South==1.0.2
|
||||
TornadIO2==0.0.3
|
||||
URLObject==2.4.0
|
||||
Unidecode==0.04.18
|
||||
YURL==0.13
|
||||
aldryn-blog==0.4.6
|
||||
aldryn-boilerplates==0.7
|
||||
aldryn-common==0.1.3
|
||||
aldryn-search==0.2.7
|
||||
anyjson==0.3.3
|
||||
chaussette==1.3.0
|
||||
cmsplugin-filer==0.10.1
|
||||
cmsplugin-filer==1.0.1
|
||||
cssselect==0.9.1
|
||||
Django==1.8.9
|
||||
django-admin-enhancer==1.0.0
|
||||
django-appconf==1.0.1
|
||||
django-appdata==0.1.4
|
||||
django-bootstrap3==6.2.2
|
||||
django-classy-tags==0.5
|
||||
django-cms==3.1.3
|
||||
django-bootstrap3==7.0.0
|
||||
django-classy-tags==0.7.1
|
||||
django-cms==3.2.1
|
||||
django-compressor==1.5
|
||||
django-countries==3.3
|
||||
django-debug-toolbar==1.3.2
|
||||
django-dotenv==1.3.0
|
||||
django-extensions==1.5.5
|
||||
django-filer==0.9.9
|
||||
django-filer==1.1.1
|
||||
django-filter==0.10.0
|
||||
django-formtools==1.0
|
||||
django-fsm==2.2.1
|
||||
django-fsm-admin==1.2.1
|
||||
django-guardian==1.2.0
|
||||
django-haystack==2.3.1
|
||||
django-hvad==1.2.1
|
||||
-e git+git@github.com:agiliq/merchant.git@2584954a1371ee6c7d11be2d75a94402e7c641d8#egg=django_merchant-master
|
||||
-e git+git@github.com:agiliq/merchant.git@2584954a1371ee6c7d11be2d75a94402e7c641d8#egg=django_merchant
|
||||
django-meta==0.3.1
|
||||
django-meta-mixin==0.1.1
|
||||
django-model-utils==2.2
|
||||
django-money==0.7.0
|
||||
django-mptt==0.6.1
|
||||
django-parler==1.5
|
||||
django-polymorphic==0.7.1
|
||||
django-reversion==1.9.3
|
||||
django-sekizai==0.7
|
||||
django-mptt==0.8.2
|
||||
django-parler==1.6.1
|
||||
django-polymorphic==0.8.1
|
||||
django-reversion==1.10.1
|
||||
django-sekizai==0.9.0
|
||||
Django-Select2==5.8.1
|
||||
django-sortedm2m==0.10.0
|
||||
django-spurl==0.6
|
||||
django-standard-form==1.1.1
|
||||
django-taggit==0.17.1
|
||||
django-taggit-autosuggest==0.2.7
|
||||
django-taggit==0.18.0
|
||||
django-taggit-autosuggest==0.2.8
|
||||
django-taggit-templatetags==0.2.5
|
||||
django-templatetag-sugar==1.0
|
||||
django-treebeard==3.0
|
||||
djangocms-admin-style==0.2.5
|
||||
django-treebeard==4.0
|
||||
djangocms-admin-style==1.1.0
|
||||
djangocms-blog==0.5.0
|
||||
djangocms-column==1.5
|
||||
djangocms-flash==0.2.0
|
||||
|
@ -69,18 +61,25 @@ djangocms-table==1.2
|
|||
djangocms-teaser==0.1
|
||||
djangocms-text-ckeditor==2.6.0
|
||||
djangorestframework==3.1.3
|
||||
easy-thumbnails==2.2
|
||||
easy-thumbnails==2.3
|
||||
factory-boy==2.5.2
|
||||
gevent==1.1b5
|
||||
gnureadline==6.3.3
|
||||
greenlet==0.4.9
|
||||
html5lib==0.999
|
||||
html5lib==0.9999999
|
||||
iowait==0.2
|
||||
ipdb==0.8.1
|
||||
ipython==3.2.0
|
||||
lesscpy==0.10.2
|
||||
lxml==3.4.4
|
||||
Mako==1.0.2
|
||||
Markdown==2.6.2
|
||||
MarkupSafe==0.23
|
||||
meinheld==0.5.8
|
||||
micawber==0.3.3
|
||||
mock==1.3.0
|
||||
pbr==1.8.1
|
||||
Pillow==3.1.1
|
||||
ply==3.6
|
||||
psutil==3.2.1
|
||||
psycopg2==2.6.1
|
||||
|
@ -92,9 +91,14 @@ pytz==2015.6
|
|||
pyzmq==14.7.0
|
||||
requests==2.7.0
|
||||
simplejson==3.8.0
|
||||
six==1.3.0
|
||||
six==1.10.0
|
||||
South==1.0.2
|
||||
sqlparse==0.1.15
|
||||
stripe==1.22.3
|
||||
tomako==0.1.0
|
||||
TornadIO2==0.0.3
|
||||
tornado==4.2.1
|
||||
|
||||
Unidecode==0.4.19
|
||||
URLObject==2.4.0
|
||||
wheel==0.29.0
|
||||
YURL==0.13
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "cms/digitalglarus/base.html" %}
|
||||
{% extends "digitalglarus/base.html" %}
|
||||
{% load staticfiles cms_tags %}
|
||||
{% block title %}About{% endblock %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "cms/digitalglarus/base.html" %}
|
||||
{% extends "digitalglarus/base.html" %}
|
||||
{% load cms_tags %}
|
||||
{% block title %}Contact{% endblock %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "cms/digitalglarus/base.html" %}
|
||||
{% extends "digitalglarus/base.html" %}
|
||||
{% load staticfiles cms_tags %}
|
||||
{% block title %}About{% endblock %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "cms/ungleichch/base.html" %}
|
||||
{% extends "ungleichch/base.html" %}
|
||||
{% block base_content %}
|
||||
{% block content %}
|
||||
{% endblock %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "cms/ungleichch/base.html" %}
|
||||
{% extends "ungleichch/base.html" %}
|
||||
{% load cms_tags %}
|
||||
{% block base_content %}
|
||||
{% placeholder "page_content" %}
|
Loading…
Reference in a new issue