From 1dd8e769425db5664a0a35b0c6c85ddc550d9110 Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Fri, 8 May 2015 22:45:31 -0500 Subject: [PATCH] bump django to 1.8.1 --- dr_botzo/dr_botzo/settings.py | 21 +++++++++++++++++++-- dr_botzo/dr_botzo/wsgi.py | 4 +++- requirements.txt | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dr_botzo/dr_botzo/settings.py b/dr_botzo/dr_botzo/settings.py index 424a387..b53007b 100644 --- a/dr_botzo/dr_botzo/settings.py +++ b/dr_botzo/dr_botzo/settings.py @@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os + BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -22,8 +23,6 @@ SECRET_KEY = '8@frp#a5wb)40g=#rbbxy($_!ttqw(*t_^os37_a*9kbx1xuvp' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = True - ALLOWED_HOSTS = [] @@ -50,10 +49,27 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', ) ROOT_URLCONF = 'dr_botzo.urls' +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + WSGI_APPLICATION = 'dr_botzo.wsgi.application' @@ -67,6 +83,7 @@ DATABASES = { } } + # Internationalization # https://docs.djangoproject.com/en/1.6/topics/i18n/ diff --git a/dr_botzo/dr_botzo/wsgi.py b/dr_botzo/dr_botzo/wsgi.py index 62d727a..7d88954 100644 --- a/dr_botzo/dr_botzo/wsgi.py +++ b/dr_botzo/dr_botzo/wsgi.py @@ -8,7 +8,9 @@ https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/ """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dr_botzo.settings") from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dr_botzo.settings") + application = get_wsgi_application() diff --git a/requirements.txt b/requirements.txt index 2a79b92..8a2ba17 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.7.8 +Django==1.8.1 django-extensions==1.5.3 httplib2==0.7.4 logilab-astng==0.24.0