summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-06-07 17:05:38 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-06-07 17:05:38 +0200
commita6d6e5077c7a6d6581004e54abc79a9d0723905c (patch)
tree6257b6d3c17311970a4f3f96e7bcd4932d7136e4 /settings.py
parent8d12c16e4489d2e9079d328c7d673a216444533a (diff)
downloadChimère - projet de référence-a6d6e5077c7a6d6581004e54abc79a9d0723905c.tar.bz2
Chimère - projet de référence-a6d6e5077c7a6d6581004e54abc79a9d0723905c.zip
Simplification
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py8
1 files changed, 7 insertions, 1 deletions
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.