Update to Django 1.2 (and some other newer versions) and some other m…

…inor settings tweaks

django_startproject/project_template/myproject/conf/common/urls/admin.py

@@ -1,10 +1,8 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 from django.contrib import admin
 
-
 admin.autodiscover()
 
-
 urlpatterns = patterns('',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),

django_startproject/project_template/myproject/conf/dev/settings.py

@@ -5,7 +5,13 @@
 
 ROOT_URLCONF = 'myproject.conf.dev.urls'
 
-# DATABASE_ENGINE = 'postgresql_psycopg2'
-# DATABASE_NAME = 'myproject'
-# DATABASE_USER = 'dbuser'
-# DATABASE_PASSWORD = 'dbpassword'
+MEDIA_ROOT = os.path.join(VAR_ROOT, 'uploads')
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'myproject',
+#        'USER': 'dbuser',
+#        'PASSWORD': 'dbpassword',
+    }
+}

django_startproject/project_template/myproject/conf/dev/urls.py

@@ -4,7 +4,7 @@
 CONF_MODULE = '%s.conf' % settings.PROJECT_MODULE_NAME
 
 urlpatterns = patterns('',
+    (r'', include('%s.urls' % CONF_MODULE)),
     (r'', include('%s.common.urls.admin' % CONF_MODULE)),
     (r'', include('%s.common.urls.static' % CONF_MODULE)),
-    (r'', include('%s.urls' % CONF_MODULE)),
 )

django_startproject/project_template/myproject/conf/local/example/settings.py

@@ -8,15 +8,18 @@
 )
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'sqlite3'
-# Place the SQLite database into ``[project]/conf/local/`` so it's outside of
-# the repository.
-DATABASE_NAME = os.path.join(PROJECT_ROOT, PROJECT_MODULE_NAME,
-                             'conf', 'local', 'dev.db')
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(VAR_ROOT, 'dev.db'),
+    }
+}
 
 ROOT_URLCONF = '%s.conf.local.urls' % PROJECT_MODULE_NAME
 
 INSTALLED_APPS += (
     'django.contrib.admin',
     'django.contrib.admindocs',
 )
+
+MEDIA_ROOT = os.path.join(VAR_ROOT, 'uploads')

django_startproject/project_template/myproject/conf/settings.py

@@ -8,6 +8,8 @@
 PROJECT_ROOT, PROJECT_MODULE_NAME = os.path.split(
     os.path.dirname(os.path.realpath(myproject.__file__))
 )
+# This assumes the project is installed in the src directory of a virtualenv.
+VAR_ROOT = os.path.join(os.path.dirname(os.path.dirname(PROJECT_ROOT)), 'var')
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -31,10 +33,7 @@
 ADMIN_MEDIA_PREFIX = '/admin-media/'
 
 MEDIA_URL = '/uploads/'
-MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'uploads')
-
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(PROJECT_ROOT, PROJECT_MODULE_NAME, 'static')
 
 ROOT_URLCONF = 'myproject.conf.urls'
 

django_startproject/project_template/myproject/conf/test/settings.py

@@ -1,14 +1,16 @@
 from myproject.conf.settings import *
 
-DEBUG=False
-TEMPLATE_DEBUG=False
-
-# Database connection info.
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = ':memory:'            # Or path to database file if using sqlite3.
+DEBUG = False
+TEMPLATE_DEBUG = DEBUG
 
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
 ROOT_URLCONF = 'myproject.conf.test.urls'
 
-INSTALLED_APPS += ('django_nose', )
+INSTALLED_APPS += ('django_nose',)
 
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'