django-devserver installed

flightdeck/settings.py

@@ -50,6 +50,8 @@ ADMIN_MEDIA_PREFIX = '/adminmedia/'
 
 ADMIN_TITLE = "FlightDeck administration"
 
+SITE_TITLE = "FlightDeck - Jetpack development"
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'somesecretkey'
 
@@ -69,6 +71,7 @@ MIDDLEWARE_CLASSES = (
 TEMPLATE_CONTEXT_PROCESSORS = (
 	"django.core.context_processors.auth",
 	"django.core.context_processors.request",
+	"base.context_processors.settings",
 )
 
 ROOT_URLCONF = 'flightdeck.urls'
@@ -79,6 +82,16 @@ TEMPLATE_DIRS = (
 	# Don't forget to use absolute paths, not relative paths.
 )
 
+DEVSERVER_MODULES = (
+    'devserver.modules.sql.SQLRealTimeModule',
+    'devserver.modules.sql.SQLSummaryModule',
+    'devserver.modules.profile.ProfileSummaryModule',
+
+    # Modules not enabled by default
+    'devserver.modules.cache.CacheSummaryModule',
+)
+
+
 try:
 	import grappelli
 	INSTALLED_APPS = ['grappelli']
@@ -86,6 +99,7 @@ except:
 	INSTALLED_APPS = []
 
 INSTALLED_APPS.extend([
+	'devserver',
 	'django.contrib.admin',
 	'django.contrib.auth',
 	'django.contrib.contenttypes',

scripts/install.sh

@@ -17,14 +17,15 @@ pip install -E $V_ENV/ -r $PROJECT_DIR/tools/pip-requirements.txt
 
 ### Grappelli section
 # checkout the repository
-svn checkout -r 680 http://django-grappelli.googlecode.com/svn/trunk/grappelli/ $SRC/grappelli
+# TODO: wait with grappelli for the newer Django
+#svn checkout -r 680 http://django-grappelli.googlecode.com/svn/trunk/grappelli/ $SRC/grappelli
 # link to site-packages
-if [ ! -e $SITE_PACKAGES/grappelli ]
-then
-	ln -fs $SRC/grappelli $SITE_PACKAGES/grappelli
-fi
+#if [ ! -e $SITE_PACKAGES/grappelli ]
+#then
+#	ln -fs $SRC/grappelli $SITE_PACKAGES/grappelli
+#fi
 # link adminmedia within project
-if [ ! -e $PROJECT_DIR/$PROJECT_NAME/adminmedia ]
-then
-	ln -fs $SRC/grappelli/media $PROJECT_DIR/$PROJECT_NAME/adminmedia
-fi
+#if [ ! -e $PROJECT_DIR/$PROJECT_NAME/adminmedia ]
+#then
+#	ln -fs $SRC/grappelli/media $PROJECT_DIR/$PROJECT_NAME/adminmedia
+#fi

scripts/runserver.sh

@@ -4,4 +4,4 @@ source scripts/environment.sh
 
 # run server
 cd $PROJECT_DIR/$PROJECT_NAME/
-$PYTHON_COMMAND ./manage.py runserver localhost:8090 --adminmedia=$PROJECT_DIR/$PROJECT_NAME/adminmedia/
+$PYTHON_COMMAND ./manage.py rundevserver localhost:8090 --adminmedia=$PROJECT_DIR/$PROJECT_NAME/adminmedia/

tools/pip-requirements.txt

@@ -1,7 +1,11 @@
-Django==1.1.1
-MySQL-python==1.2.3c1
-PIL==1.1.7
-South==0.6.2
-docutils==0.6
-wsgiref==0.1.2
-yolk==0.4.1
+Django>=1.1.1
+MySQL-python
+PIL
+South
+docutils
+wsgiref
+yolk
+
+-e git+git://github.com/toastdriven/django-haystack#egg=django_haystack
+-e git+git://github.com/dcramer/django-devserver#egg=django_devserver
+