From 69fa2c608297464013e444ef53f158997288f621 Mon Sep 17 00:00:00 2001 From: David Seaward Date: Wed, 7 Jun 2017 13:16:21 +0200 Subject: [PATCH] update to django 1.11.2 --- purist_account/settings.py | 16 ++++++++-------- purist_account/settings_local.txt | 3 ++- purist_account/urls.py | 2 +- purist_account/wsgi.py | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/purist_account/settings.py b/purist_account/settings.py index a01b08f..3bf7d0a 100755 --- a/purist_account/settings.py +++ b/purist_account/settings.py @@ -1,13 +1,13 @@ """ Django settings for purist_account project. -Generated by 'django-admin startproject' using Django 1.10.6. +Generated by 'django-admin startproject' using Django 1.11.2. For more information on this file, see -https://docs.djangoproject.com/en/1.10/topics/settings/ +https://docs.djangoproject.com/en/1.11/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.10/ref/settings/ +https://docs.djangoproject.com/en/1.11/ref/settings/ """ import os @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'secret' @@ -81,7 +81,7 @@ WSGI_APPLICATION = 'purist_account.wsgi.application' # Database -# https://docs.djangoproject.com/en/1.10/ref/settings/#databases +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases DATABASES = { 'default': { @@ -92,7 +92,7 @@ DATABASES = { # Password validation -# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -111,7 +111,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization -# https://docs.djangoproject.com/en/1.10/topics/i18n/ +# https://docs.djangoproject.com/en/1.11/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -125,6 +125,6 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.10/howto/static-files/ +# https://docs.djangoproject.com/en/1.11/howto/static-files/ STATIC_URL = '/static/' diff --git a/purist_account/settings_local.txt b/purist_account/settings_local.txt index 5589bb6..38891d3 100755 --- a/purist_account/settings_local.txt +++ b/purist_account/settings_local.txt @@ -65,7 +65,7 @@ AUTH_USER_MODEL = 'ldapregister.User' # # See also: -# https://docs.djangoproject.com/en/1.10/ref/settings/#databases +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases # and https://pypi.python.org/pypi/django-ldapdb/ # (re-uses LDAP connection details from authentication settings, you can change this) @@ -84,3 +84,4 @@ DATABASES = { } DATABASE_ROUTERS = ['ldapdb.router.Router'] + diff --git a/purist_account/urls.py b/purist_account/urls.py index f5d680b..3d7e26d 100755 --- a/purist_account/urls.py +++ b/purist_account/urls.py @@ -1,7 +1,7 @@ """purist_account URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.10/topics/http/urls/ + https://docs.djangoproject.com/en/1.11/topics/http/urls/ Examples: Function views 1. Add an import: from my_app import views diff --git a/purist_account/wsgi.py b/purist_account/wsgi.py index 9d39f22..dc240b6 100755 --- a/purist_account/wsgi.py +++ b/purist_account/wsgi.py @@ -4,7 +4,7 @@ WSGI config for purist_account project. It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ """ import os -- 2.22.0