v9

PYTHONHOME
v8 changelog
2026-06-05 23:10:16 +00:00 · 2012-05-30 17:32:16 -04:00 · 2012-05-30 17:31:03 -04:00 · 2012-05-30 16:01:38 -04:00 · 2012-05-30 15:59:55 -04:00 · 2012-05-30 15:57:33 -04:00
5 changed files with 36 additions and 11 deletions
@@ -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:
@@ -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.
-[ $HEROKU_DIR_STATUS -eq 0 ] && {
-  touch .heroku/injection_disabled
-}
+# TODO: This is a new app, disable injection.
+# [ $HEROKU_DIR_STATUS -eq 0 ] && {
+  #TODO: touch .heroku/injection_disabled
+# }
 set -e


@@ -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"
@@ -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
@@ -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
Author	SHA1	Message	Date
Kenneth Reitz	662a311f95	v9	2012-05-30 17:32:16 -04:00
Kenneth Reitz	bfd6ea22ca	PYTHONHOME	2012-05-30 17:31:03 -04:00
Kenneth Reitz	c5d7991468	v8 changelog	2012-05-30 16:01:38 -04:00
Kenneth Reitz	c4404694e1	warn after injection	2012-05-30 15:59:55 -04:00
Kenneth Reitz	e914736956	don't exit (yet) on collectstatic fail	2012-05-30 15:57:33 -04:00
Kenneth Reitz	23833dda9b	comment out injection step	2012-05-30 15:53:49 -04:00
Kenneth Reitz	15573b9d3f	simpler collectstatic	2012-05-30 15:47:39 -04:00
Kenneth Reitz	86661c1cda	July 1	2012-05-30 15:23:14 -04:00
Kenneth Reitz	9cbace7f76	$DISABLE_COLLECTSTATIC	2012-05-30 15:15:10 -04:00
Kenneth Reitz	74cb870488	leave injection off for now	2012-05-30 15:14:36 -04:00
Kenneth Reitz	ae9b83f07c	fix error message for collectstatic	2012-05-30 13:55:22 -04:00
Kenneth Reitz	d70c681c32	setting injection notice for users #45	2012-05-30 13:52:08 -04:00
Kenneth Reitz	c312d917a1	completely set DATABASES	2012-05-30 12:50:08 -04:00