diff options
| -rw-r--r-- | scipy2015/settings.py | 44 | ||||
| -rw-r--r-- | scipy2015/urls.py | 25 | ||||
| -rw-r--r-- | scipy2015/wsgi.py | 6 | ||||
| -rw-r--r-- | website/migrations/__init__.py | 0 |
4 files changed, 24 insertions, 51 deletions
diff --git a/scipy2015/settings.py b/scipy2015/settings.py index 3582636..1186d26 100644 --- a/scipy2015/settings.py +++ b/scipy2015/settings.py @@ -1,30 +1,29 @@ """ Django settings for scipy2015 project. -Generated by 'django-admin startproject' using Django 1.8.2. - For more information on this file, see -https://docs.djangoproject.com/en/1.8/topics/settings/ +https://docs.djangoproject.com/en/1.6/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.8/ref/settings/ +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(os.path.abspath(__file__))) +BASE_DIR = os.path.dirname(os.path.dirname(__file__)) # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '=#zh5&820@y_cjzo13qpuwpbqsj4$=q9r4bvphy5(jvh19i2k)' +SECRET_KEY = 'w81ia+6)sak!)t@kv=@x267y78ceh4iu2c@o@2#8+h$kua3e9a' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +TEMPLATE_DEBUG = True + ALLOWED_HOSTS = [] @@ -45,35 +44,21 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', ) -ROOT_URLCONF = 'scipy2015.urls' +TEMPLATE_DIRS = ( + os.path.join(BASE_DIR, 'templates'), +) -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'websites/templates')], - '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', - ], - }, - }, -] +ROOT_URLCONF = 'scipy2015.urls' WSGI_APPLICATION = 'scipy2015.wsgi.application' # Database -# https://docs.djangoproject.com/en/1.8/ref/settings/#databases +# https://docs.djangoproject.com/en/1.6/ref/settings/#databases DATABASES = { 'default': { @@ -82,9 +67,8 @@ DATABASES = { } } - # Internationalization -# https://docs.djangoproject.com/en/1.8/topics/i18n/ +# https://docs.djangoproject.com/en/1.6/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -98,6 +82,6 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.8/howto/static-files/ +# https://docs.djangoproject.com/en/1.6/howto/static-files/ STATIC_URL = '/static/' diff --git a/scipy2015/urls.py b/scipy2015/urls.py index d88eadc..b0c6df2 100644 --- a/scipy2015/urls.py +++ b/scipy2015/urls.py @@ -1,22 +1,13 @@ -"""scipy2015 URL Configuration +from django.conf.urls import patterns, include, url -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.8/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') -Including another URLconf - 1. Add an import: from blog import urls as blog_urls - 2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) -""" -from django.conf.urls import include, url from django.contrib import admin +admin.autodiscover() + +urlpatterns = patterns('', + # Examples: + # url(r'^$', 'scipy2015.views.home', name='home'), + # url(r'^blog/', include('blog.urls')), -urlpatterns = [ url(r'^admin/', include(admin.site.urls)), url(r'^', include('website.urls', namespace='website')), -] +) diff --git a/scipy2015/wsgi.py b/scipy2015/wsgi.py index f969dac..93b0241 100644 --- a/scipy2015/wsgi.py +++ b/scipy2015/wsgi.py @@ -4,13 +4,11 @@ WSGI config for scipy2015 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.8/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/ """ import os - -from django.core.wsgi import get_wsgi_application - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scipy2015.settings") +from django.core.wsgi import get_wsgi_application application = get_wsgi_application() diff --git a/website/migrations/__init__.py b/website/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/website/migrations/__init__.py +++ /dev/null |