From 0558d6e3966d4c3594d5cacb5519a2f013c7e190 Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Mon, 29 Feb 2016 23:28:31 +0100 Subject: [PATCH] django version update #3 --- digitalglarus/cms_plugins.py | 4 +- .../migrations/0010_auto_20160229_2106.py | 19 ++++++ .../{ => cms}/digitalglarus/about.html | 0 .../{ => cms}/digitalglarus/base.html | 0 .../{ => cms}/digitalglarus/contact.html | 0 .../{ => cms}/digitalglarus/detail.html | 0 .../{ => cms}/digitalglarus/gallery.html | 0 .../{ => cms}/digitalglarus/index.html | 0 .../{ => cms}/digitalglarus/letscowork.html | 0 .../{ => cms}/digitalglarus/supporters.html | 0 .../digitalglarus/supporters_plugin.html | 0 dynamicweb/settings/base.py | 9 +-- dynamicweb/urls.py | 22 +++---- pg_upgrade_internal.log | 35 ++++++++++ pg_upgrade_server.log | 25 ++++++++ pg_upgrade_utility.log | 25 ++++++++ requirements.txt | 64 ++++++++++--------- 17 files changed, 153 insertions(+), 50 deletions(-) create mode 100644 digitalglarus/migrations/0010_auto_20160229_2106.py rename digitalglarus/templates/{ => cms}/digitalglarus/about.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/base.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/contact.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/detail.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/gallery.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/index.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/letscowork.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/supporters.html (100%) rename digitalglarus/templates/{ => cms}/digitalglarus/supporters_plugin.html (100%) create mode 100644 pg_upgrade_internal.log create mode 100644 pg_upgrade_server.log create mode 100644 pg_upgrade_utility.log diff --git a/digitalglarus/cms_plugins.py b/digitalglarus/cms_plugins.py index 703176a2..d379116c 100644 --- a/digitalglarus/cms_plugins.py +++ b/digitalglarus/cms_plugins.py @@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _ class CMSGalleryPlugin(CMSPluginBase): model = DGGalleryPlugin name = _("Digital Glarus Gallery") - render_template = "digitalglarus/gallery.html" + render_template = "cms/digitalglarus/gallery.html" def render(self, context, instance, placeholder): context.update({ @@ -19,7 +19,7 @@ class CMSGalleryPlugin(CMSPluginBase): class CMSSupportersPlugin(CMSPluginBase): name = _("Digital Glarus Supporters") model = DGSupportersPlugin - render_template = "digitalglarus/supporters_plugin.html" + render_template = "cms/digitalglarus/supporters_plugin.html" def render(self, context, instance, placeholder): context.update({ diff --git a/digitalglarus/migrations/0010_auto_20160229_2106.py b/digitalglarus/migrations/0010_auto_20160229_2106.py new file mode 100644 index 00000000..251af2cb --- /dev/null +++ b/digitalglarus/migrations/0010_auto_20160229_2106.py @@ -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), + ), + ] diff --git a/digitalglarus/templates/digitalglarus/about.html b/digitalglarus/templates/cms/digitalglarus/about.html similarity index 100% rename from digitalglarus/templates/digitalglarus/about.html rename to digitalglarus/templates/cms/digitalglarus/about.html diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/cms/digitalglarus/base.html similarity index 100% rename from digitalglarus/templates/digitalglarus/base.html rename to digitalglarus/templates/cms/digitalglarus/base.html diff --git a/digitalglarus/templates/digitalglarus/contact.html b/digitalglarus/templates/cms/digitalglarus/contact.html similarity index 100% rename from digitalglarus/templates/digitalglarus/contact.html rename to digitalglarus/templates/cms/digitalglarus/contact.html diff --git a/digitalglarus/templates/digitalglarus/detail.html b/digitalglarus/templates/cms/digitalglarus/detail.html similarity index 100% rename from digitalglarus/templates/digitalglarus/detail.html rename to digitalglarus/templates/cms/digitalglarus/detail.html diff --git a/digitalglarus/templates/digitalglarus/gallery.html b/digitalglarus/templates/cms/digitalglarus/gallery.html similarity index 100% rename from digitalglarus/templates/digitalglarus/gallery.html rename to digitalglarus/templates/cms/digitalglarus/gallery.html diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/cms/digitalglarus/index.html similarity index 100% rename from digitalglarus/templates/digitalglarus/index.html rename to digitalglarus/templates/cms/digitalglarus/index.html diff --git a/digitalglarus/templates/digitalglarus/letscowork.html b/digitalglarus/templates/cms/digitalglarus/letscowork.html similarity index 100% rename from digitalglarus/templates/digitalglarus/letscowork.html rename to digitalglarus/templates/cms/digitalglarus/letscowork.html diff --git a/digitalglarus/templates/digitalglarus/supporters.html b/digitalglarus/templates/cms/digitalglarus/supporters.html similarity index 100% rename from digitalglarus/templates/digitalglarus/supporters.html rename to digitalglarus/templates/cms/digitalglarus/supporters.html diff --git a/digitalglarus/templates/digitalglarus/supporters_plugin.html b/digitalglarus/templates/cms/digitalglarus/supporters_plugin.html similarity index 100% rename from digitalglarus/templates/digitalglarus/supporters_plugin.html rename to digitalglarus/templates/cms/digitalglarus/supporters_plugin.html diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 16c14f66..79647397 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -146,13 +146,8 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ) TEMPLATE_DIRS = ( - os.path.join(PROJECT_DIR, 'templates'), + os.path.join(PROJECT_DIR, 'templates'),os.path.join(PROJECT_DIR, 'templates/cms/'), ) - -CMS_TEMPLATES_DIR = { - 1: os.path.join(TEMPLATE_DIRS[0], 'cms/'), -} - # Database # https://docs.djangoproject.com/en/1.8/ref/settings/#databases @@ -283,7 +278,7 @@ 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', diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index 129058de..08346c0e 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -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\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\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('', diff --git a/pg_upgrade_internal.log b/pg_upgrade_internal.log new file mode 100644 index 00000000..d69c307c --- /dev/null +++ b/pg_upgrade_internal.log @@ -0,0 +1,35 @@ + +----------------------------------------------------------------- + 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. diff --git a/pg_upgrade_server.log b/pg_upgrade_server.log new file mode 100644 index 00000000..b63b126f --- /dev/null +++ b/pg_upgrade_server.log @@ -0,0 +1,25 @@ + +----------------------------------------------------------------- + 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 +----------------------------------------------------------------- + diff --git a/pg_upgrade_utility.log b/pg_upgrade_utility.log new file mode 100644 index 00000000..b63b126f --- /dev/null +++ b/pg_upgrade_utility.log @@ -0,0 +1,25 @@ + +----------------------------------------------------------------- + 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 +----------------------------------------------------------------- + diff --git a/requirements.txt b/requirements.txt index 5fd718e0..c779cefb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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