v9

#45

Changelog.md

@@ -1,3 +1,20 @@
+## v9
+
+Bugfixes:
+
+* Unset PYTHONHOME in buildpack for [user_env_compile](http://devcenter.heroku.com/articles/labs-user-env-compile).
+
+## v8
+
+Features:
+
+* Disable Django collectstatic with `$DISABLE_COLLECTSTATIC` + [user_env_compile](http://devcenter.heroku.com/articles/labs-user-env-compile).
+
+Bugfixes:
+
+* Don't disbable injection for new Django apps.
+* Inform user of July 1, 2012 deprecation of Django injection.
+
 ## v7
 
 Features:

bin/compile

@@ -61,7 +61,7 @@ PYTHON_EXE="python2.7"
 
 # Sanitizing environment variables.
 unset GIT_DIR
-unset PYTHON_HOME
+unset PYTHONHOME
 unset PYTHONPATH
 
 # We'll need to send these statics to other scripts we `source`.
@@ -140,10 +140,10 @@ set +e
 mkdir .heroku &> /dev/null
 HEROKU_DIR_STATUS=$?
 
-# This is a new app, disable injection.
+# TODO: This is a new app, disable injection.
-[ $HEROKU_DIR_STATUS -eq 0 ] && {
+# [ $HEROKU_DIR_STATUS -eq 0 ] && {
-  touch .heroku/injection_disabled
+  #TODO: touch .heroku/injection_disabled
-}
+# }
 set -e
 
 

bin/steps/django/collectstatic

@@ -13,11 +13,9 @@ indent() {
 python $MANAGE_FILE collectstatic --help &> /dev/null && RUN_COLLECTSTATIC=true
 
 # Don't raise errors if SILENCE_COLLECTSTATIC is set.
-if [ ! "$SILENCE_COLLECTSTATIC" ]; then
-    set -e
-fi
 
 echo "-----> Collecting static files"
+set -e
 
 # Compile assets if collectstatic appears to be kosher.
 if [ "$RUN_COLLECTSTATIC" ]; then
@@ -26,7 +24,9 @@ if [ "$RUN_COLLECTSTATIC" ]; then
     [ $? -ne 0 ] && {
         echo " !     Error running manage.py collectstatic. More info:"
         echo "       http://devcenter.heroku.com/articles/django-assets"
+        # exit 1
     }
+
 else
     echo " !     Django collecstatic is not configured. Learn more:"
     echo "       http://devcenter.heroku.com/articles/django-assets"

bin/steps/django/init

@@ -14,6 +14,14 @@ export SETTINGS_FILE MANAGE_FILE PROJECT DISABLE_INJECTION
 
 if [ ! "$DISABLE_INJECTION" ]; then
     source $BIN_DIR/steps/django/injection
+    echo " !     Notice: settings injection will be deprecated for all new Django "
+    echo " !     apps starting on July 1, 2012. Learn more:"
+    echo " !     https://devcenter.heroku.com/articles/django-injection"
+fi
+
+
+
+if [ ! "$DISABLE_COLLECTSTATIC" ]; then
+    source $BIN_DIR/steps/django/collectstatic
 fi
 
-source $BIN_DIR/steps/django/collectstatic

bin/steps/django/injection

@@ -19,7 +19,7 @@ indent() {
 }
 
 echo "-----> Installing dj-database-url..."
-pip install --use-mirrors dj-database-url | indent
+pip install --use-mirrors dj-database-url>=0.2.0 | indent
 
 echo "-----> Injecting Django settings..."
 
@@ -32,6 +32,6 @@ cat >>$SETTINGS_FILE <<EOF
 
 import dj_database_url
 
-DATABASES['default'] = dj_database_url.config()
+DATABASES = {'default': dj_database_url.config(default='postgres://')}
 EOF