From 9bb1ce408fb542f3b77190707dc188bb2c48ce83 Mon Sep 17 00:00:00 2001 From: Parbhat Puri Date: Tue, 4 Aug 2015 15:24:36 +0530 Subject: [PATCH] Upgraded to Django 1.8.3 and Wagtail 1.0 - Issue #22 --- .../pages/migrations/0002_create_homepage.py | 2 +- {{cookiecutter.repo_name}}/requirements/base.txt | 13 +++++++------ {{cookiecutter.repo_name}}/requirements/dev.txt | 4 ++-- .../requirements/production.txt | 2 +- .../{{cookiecutter.repo_name}}/urls.py | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/{{cookiecutter.repo_name}}/pages/migrations/0002_create_homepage.py b/{{cookiecutter.repo_name}}/pages/migrations/0002_create_homepage.py index 21473064..8593722f 100644 --- a/{{cookiecutter.repo_name}}/pages/migrations/0002_create_homepage.py +++ b/{{cookiecutter.repo_name}}/pages/migrations/0002_create_homepage.py @@ -16,7 +16,7 @@ def create_homepage(apps, schema_editor): # Create content type for homepage model homepage_content_type, created = ContentType.objects.get_or_create( - model='homepage', app_label='pages', defaults={'name': 'Homepage'}) + model='homepage', app_label='pages') # Create a new homepage homepage = HomePage.objects.create( diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 76602a51..c6fc0ec8 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -1,7 +1,8 @@ -Django==1.7.9 -psycopg2==2.6 -elasticsearch==1.2.0 -django-redis==3.8.2 -wagtail>=0.8.8,<1.0 -celery==3.1.17 +Django==1.8.3 +psycopg2==2.6.1 +elasticsearch==1.6.0 +django-redis==4.2.0 +wagtail==1.0 +celery==3.1.18 Fabric==1.10.2 +django-libsass==0.3 \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/requirements/dev.txt b/{{cookiecutter.repo_name}}/requirements/dev.txt index c7e6c4c3..244a4f50 100644 --- a/{{cookiecutter.repo_name}}/requirements/dev.txt +++ b/{{cookiecutter.repo_name}}/requirements/dev.txt @@ -7,5 +7,5 @@ django-medusa==0.3.0 django-sendfile==0.3.8 # django-debug-toolbar that works with Django 1.5+ -django-debug-toolbar==1.3.0 -django-extensions==1.5.1 +django-debug-toolbar==1.3.2 +django-extensions==1.5.5 diff --git a/{{cookiecutter.repo_name}}/requirements/production.txt b/{{cookiecutter.repo_name}}/requirements/production.txt index 0dba3ad3..d59dc29d 100644 --- a/{{cookiecutter.repo_name}}/requirements/production.txt +++ b/{{cookiecutter.repo_name}}/requirements/production.txt @@ -2,4 +2,4 @@ django-celery==3.1.16 gunicorn==19.3 redis==2.10.3 -django-redis-cache==1.2.0 +django-redis-cache==1.5.3 diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py index acdd073a..41932d05 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py @@ -35,5 +35,5 @@ urlpatterns += staticfiles_urlpatterns() urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += [ - url(r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'favicon.ico')) + url(r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'favicon.ico', permanent=True)) ]