Changeset 7fb28a0 for remit/settings

Timestamp:

Jul 5, 2014, 8:32:51 PM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

cabf7ac

Parents:

d604f81 (diff), e24d22f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (07/05/14 20:29:08)

git-committer:

Alex Dehnert <adehnert@…> (07/05/14 20:32:51)

Message:

Make development easier

• simple install instructions for a dev install
• support virtualenv
• add script for setting up a dev install
  • settings, including SECRET_KEY
  • DB sync
  • creation of an account structure for a semi-plausible group
  • BudgetTerm? creation
• Support the newest released Django (1.6)

Location:

remit/settings

Files:

• __init__.py (moved) (moved from remit/settings.py) (6 diffs)
• init-dev.sh (added)
• local.dev-template.py (added)

remit/settings/__init__.py

@@ -3 +3 @@
 import sys
 
-SITE_ROOT = os.path.normpath(os.path.dirname(__file__))
+SITE_ROOT = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
 SITE_WEB_PATH = ''
 DEFAULT_DOMAIN = 'mit.edu'
@@ -9 +9 @@
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
+
+ATOMIC_REQUESTS = True
 
 ADMINS = (
@@ -53 +55 @@
 USE_I18N = True
 
-from local_settings import *
+# Required settings
+# SITE_URL_BASE: used to construct absolute URLs for use in emails
+
+from local import *
 
 # Absolute path to the directory that holds media.
@@ -85 +90 @@
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.transaction.TransactionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -116 +120 @@
     'django.contrib.sessions',
     'django.contrib.sites',
+    'django.contrib.staticfiles',
     'treebeard',
     'south',
@@ -126 +131 @@
 USER_EMAIL_SIGNATURE = "%s Treasury" % (GROUP_NAME,)
 
-from local_settings_after import *
+from local_after import *