From 6b7618cc542080a198cbf33b76a3914f10599a24 Mon Sep 17 00:00:00 2001 From: Scott Bragg Date: Fri, 10 Jun 2016 13:38:24 +1000 Subject: [PATCH] Able to load local_settings for production environment. --- .gitignore | 1 + pinaxcon/settings.py | 6 ++++++ requirements.txt | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a78689e..e20a9a14 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ _build/ .DS_Store dev.db .coverage +pinaxcon/site_media/ \ No newline at end of file diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 60e96561..3eaf27fa 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -233,3 +233,9 @@ NOSE_ARGS = [ '--with-coverage', '--cover-package=registrasion.controllers,registrasion.models', ] + +# Production settings have their own file to override stuff here +try: + from local_settings import * +except ImportError: + pass diff --git a/requirements.txt b/requirements.txt index 454e096e..278a2d4e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pinax-boxes==2.1.2 django-nose==1.4.3 coverage==4.0.3 -# Registrasion -# Install via setuptools rather than pip +# Registrasion + Symposion +# Install via pip repo cloned locally #registrasion==0.1.1 #https://github.com/lca2017/symposion/tarball/master#egg=symposion