From 1c82d820c9285e5de3d64c3462826173a3ecf279 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Fri, 9 Oct 2015 14:31:55 -0400 Subject: [PATCH 1/8] Be more conservative to what we cache --- bin/compile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/compile b/bin/compile index d81772e..6dd4f8b 100755 --- a/bin/compile +++ b/bin/compile @@ -20,7 +20,7 @@ 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" @@ -145,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 @@ -209,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 From 1d8afb452ef63927a196c4f147c93b733b421613 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Oct 2015 09:47:52 -0400 Subject: [PATCH 2/8] legacy venv location --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 6dd4f8b..6bcd1c5 100755 --- a/bin/compile +++ b/bin/compile @@ -20,7 +20,7 @@ CACHE_DIR=$2 ENV_DIR=$3 -CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version" +CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version .heroku/venv" # Static configurations for virtualenv caches. VIRTUALENV_LOC=".heroku/venv" From 0818d5428f8e2c01fadcfd5edc8f8d48aee8406a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Oct 2015 09:51:56 -0400 Subject: [PATCH 3/8] v67 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab7849..aaaf8b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Python Buildpack Changelog +## v67 (2015-10-12) + +Further improved cache compatibility with multi and node.js buildpacks. + ## v66 (2015-10-09) From b6adf5223bc646e27064ef06a8e7dd786a6e7004 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Oct 2015 09:52:18 -0400 Subject: [PATCH 4/8] changelog cleanup --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaaf8b6..1da0644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ Further improved cache compatibility with multi and node.js buildpacks. - ## v66 (2015-10-09) Improved compatibility with multi and node.js buildpacks. From ce3c68538d889a1b32c2b20564174bde44646622 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Oct 2015 10:36:34 -0400 Subject: [PATCH 5/8] no .heroku/venv --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 6bcd1c5..6dd4f8b 100755 --- a/bin/compile +++ b/bin/compile @@ -20,7 +20,7 @@ CACHE_DIR=$2 ENV_DIR=$3 -CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version .heroku/venv" +CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version" # Static configurations for virtualenv caches. VIRTUALENV_LOC=".heroku/venv" From cd90c7d1d804684cb3c6df03cc12cfe44094dc1d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Oct 2015 10:39:07 -0400 Subject: [PATCH 6/8] v68 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da0644..b550243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 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. From 6f6b75bb1f129044670fb0ab43680af762f66739 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Oct 2015 16:23:00 -0400 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b550243..18a359a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Python Buildpack Changelog +## v69 (2015-10-12) + +Revert to v66. + ## v68 (2015-10-12) Fixed .heroku/venv error with modern apps. From 2963d2520b661be85a642ac5af6e53e1fc4fa1e9 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Thu, 15 Oct 2015 10:34:24 -0400 Subject: [PATCH 8/8] update changelog --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab7849..88d6655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Python Buildpack Changelog +## v69 (2015-10-12) + +Revert to v66. + +## 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) @@ -42,4 +53,3 @@ Default Python is now latest 2.7.10. Updated Pip and Distribute. - Default Python version is v2.7.10 - Setuptools updated to v16.0 - Pip updated to v7.0.1 -