From dd713011a52535de6826fcff2970ed86b85c6bfb Mon Sep 17 00:00:00 2001 From: Arne Schauf Date: Sat, 28 Sep 2013 15:06:34 +0200 Subject: [PATCH] settings structure --- nsupdate/nsupdate/settings.py | 5 +++++ setup.py | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nsupdate/nsupdate/settings.py b/nsupdate/nsupdate/settings.py index 5075075..367df29 100644 --- a/nsupdate/nsupdate/settings.py +++ b/nsupdate/nsupdate/settings.py @@ -158,3 +158,8 @@ LOGGING = { } ACCOUNT_ACTIVATION_DAYS = 7 + +try: + from .local_settings import * +except ImportError: + pass diff --git a/setup.py b/setup.py index 3942ab9..77d5684 100644 --- a/setup.py +++ b/setup.py @@ -17,8 +17,12 @@ setup( zip_safe=False, platforms='any', install_requires=[ - 'django', + 'django<1.6', 'dnspython', + 'south', + 'django-bootstrap-form', + 'django-registration', + 'django-debug-toolbar', #for dev ], classifiers=[ 'Development Status :: 2 - Pre-Alpha',