v68

no .heroku/venv
changelog cleanup
2026-06-05 23:10:16 +00:00 · 2015-10-12 10:39:07 -04:00 · 2015-10-12 10:36:34 -04:00 · 2015-10-12 09:52:18 -04:00 · 2015-10-12 09:51:56 -04:00 · 2015-10-12 09:47:52 -04:00
2 changed files with 27 additions and 12 deletions
@@ -1,5 +1,16 @@
 # Python Buildpack Changelog

+## v68 (2015-10-12)
+
+Fixed .heroku/venv error with modern apps.
+
+## v67 (2015-10-12)
+
+Further improved cache compatibility with multi and node.js buildpacks.
+
+## v66 (2015-10-09)
+
+Improved compatibility with multi and node.js buildpacks.

 ## v65 (2015-10-08)

@@ -20,13 +20,11 @@ CACHE_DIR=$2
 ENV_DIR=$3


-CACHED_DIRS=".heroku"
+CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version"

 # Static configurations for virtualenv caches.
 VIRTUALENV_LOC=".heroku/venv"
 LEGACY_TRIGGER="lib/python2.7"
-PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
-WEBCONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/python.webconcurrency.sh"

 DEFAULT_PYTHON_VERSION="python-2.7.10"
 DEFAULT_PYTHON_STACK="cedar"
@@ -57,10 +55,6 @@ TMP_APP_DIR=$CACHE_DIR/tmp_app_dir

 bpwatch start compile

-
-# We'll need to send these statics to other scripts we `source`.
-export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
-
 # Syntax sugar.
 source $BIN_DIR/utils

@@ -83,7 +77,7 @@ if [[ ! "$DOCKER_BUILD" ]]; then

  # Copy Application code in.
  bpwatch start appdir_stage
-    deep-mv $BUILD_DIR $APP_DIR
+    deep-cp $BUILD_DIR $APP_DIR
  bpwatch stop appdir_stage
 fi

@@ -92,6 +86,13 @@ fi
 ORIG_BUILD_DIR=$BUILD_DIR
 BUILD_DIR=$APP_DIR

+# Set up outputs under new context
+PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
+WEBCONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/python.webconcurrency.sh"
+
+# We'll need to send these statics to other scripts we `source`.
+export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
+
 # Prepend proper path buildpack use.
 export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
 export PYTHONUNBUFFERED=1
@@ -144,8 +145,9 @@ bpwatch stop clear_old_venvs

 # Restore old artifacts from the cache.
 bpwatch start restore_cache
-  for dir in $CACHED_DIRS; do
-    cp -R $CACHE_DIR/$dir . &> /dev/null || true
+  for dir in $CACHE_ENTRIES; do
+    mkdir -p $(basename $dir)
+    cp -R $CACHE_DIR/$dir $dir &> /dev/null || true
  done
 bpwatch stop restore_cache

@@ -208,9 +210,10 @@ bpwatch stop post_compile

 # Store new artifacts in cache.
 bpwatch start dump_cache
-  for dir in $CACHED_DIRS; do
+  for dir in $CACHE_ENTRIES; do
    rm -rf $CACHE_DIR/$dir
-    cp -R $dir $CACHE_DIR/
+    mkdir -p $(dirname $CACHE_DIR/$dir)
+    cp -R $dir $CACHE_DIR/$dir
  done
 bpwatch stop dump_cache

@@ -218,6 +221,7 @@ bpwatch stop dump_cache
 if [[ ! "$DOCKER_BUILD" ]]; then

  bpwatch start appdir_commit
+    deep-rm $ORIG_BUILD_DIR
    deep-mv $BUILD_DIR $ORIG_BUILD_DIR
  bpwatch stop appdir_commit
Author	SHA1	Message	Date
kennethreitz	cd90c7d1d8	v68	2015-10-12 10:39:07 -04:00
kennethreitz	ce3c68538d	no .heroku/venv	2015-10-12 10:36:34 -04:00
kennethreitz	b6adf5223b	changelog cleanup	2015-10-12 09:52:18 -04:00
kennethreitz	0818d5428f	v67	2015-10-12 09:51:56 -04:00
kennethreitz	1d8afb452e	legacy venv location	2015-10-12 09:47:52 -04:00
Owen Jacobson	1c82d820c9	Be more conservative to what we cache	2015-10-09 15:28:24 -04:00
kennethreitz	7cf8712d3c	v66	2015-10-09 10:36:36 -04:00
kennethreitz	2b62692ab2	Merge branch 'preserve-ORIG_BUILD_DIR' of https://github.com/tommyvn/heroku-buildpack-python into multi	2015-10-09 09:40:03 -04:00
Tom van Neerijnen	a91e9c2fc1	export BUILD_DIR and friends after context change Anything using theses exported variables should be using them in the new context rather than the old	2015-08-12 11:43:39 +01:00
Tom van Neerijnen	da96cdf21e	set *PROFILE_PATH after context change PROFILE_PATH and WEBCONCURRENCY_PROFILE_PATH must land in the new build context and so should be set after the new context is created	2015-08-12 11:33:06 +01:00
Tom van Neerijnen	0b2e4e9b22	preserve ORIG_BUILD_DIR during the build process using the apt buildpack in combination with the multi buildpack exports some paths out of ORIG_BUILD_DIR. By copying instead of moving this should allow building of python modules that have dependancies on any packages installed into ORIG_BUILD_DIR.	2015-08-12 10:53:51 +01:00