From bfcfb54d1b7ef445119ba3186225b6fdd0df2b2d Mon Sep 17 00:00:00 2001
From: Scott Bragg <jsbragg@scriptforge.org>
Date: Fri, 10 Jun 2016 11:25:46 +1000
Subject: [PATCH 1/3] Update requirements on lca2017 branch so pip doesn't get
 confused with different Django and Symposion versions

---
 requirements.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e15748a2..454e096e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-Django==1.9.2
+# Should use latest 1.9 for security
+Django>=1.9.2
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
@@ -13,5 +14,6 @@ django-nose==1.4.3
 coverage==4.0.3
 
 # Registrasion
-registrasion==0.1.1
-https://github.com/lca2017/symposion/tarball/master#egg=symposion
+# Install via setuptools rather than pip
+#registrasion==0.1.1
+#https://github.com/lca2017/symposion/tarball/master#egg=symposion

From 6b7618cc542080a198cbf33b76a3914f10599a24 Mon Sep 17 00:00:00 2001
From: Scott Bragg <jsbragg@scriptforge.org>
Date: Fri, 10 Jun 2016 13:38:24 +1000
Subject: [PATCH 2/3] 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

From 56cad69f8f615b1cfed469add4c978f38d3eabee Mon Sep 17 00:00:00 2001
From: Scott Bragg <jsbragg@scriptforge.org>
Date: Fri, 10 Jun 2016 13:47:51 +1000
Subject: [PATCH 3/3] Git Ignore local_settings so we don't accidentally
 publish the secret!

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e20a9a14..6949f3a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ _build/
 .DS_Store
 dev.db
 .coverage
-pinaxcon/site_media/
\ No newline at end of file
+pinaxcon/site_media/
+local_settings.py