From a6d6e5077c7a6d6581004e54abc79a9d0723905c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 7 Jun 2013 17:05:38 +0200 Subject: Simplification --- settings.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index eaeac4a..cb2199b 100644 --- a/settings.py +++ b/settings.py @@ -4,7 +4,7 @@ # Don't edit this file: # overload all theses settings in your local_settings.py file -import os +import os, sys DEBUG = False TEMPLATE_DEBUG = DEBUG @@ -81,6 +81,9 @@ CHIMERE_THUMBS_SCALE_WIDTH=None CHIMERE_CSV_ENCODING = 'ISO-8859-1' +# generic contact email +CONTACT_EMAIL = '' + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) @@ -98,6 +101,9 @@ DATABASES = { }, } +if 'test' in sys.argv: + SOUTH_TESTS_MIGRATE = False + # Local time zone for this installation. Choices can be found here: # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE # although not all variations may be possible on all operating systems. -- cgit v1.2.3