v70 changelog

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Python Buildpack Changelog
 
+## v70 (2015-10-29)
+
+Improved compatibility with multi and node.js buildpacks.
+
+## v69 (2015-10-12)
+
+Revert to v66.
+
 ## v68 (2015-10-12)
 
 Fixed .heroku/venv error with modern apps.
@@ -49,4 +57,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
-

bin/compile

@@ -19,9 +19,6 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 ENV_DIR=$3
 
-
-CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version"
-
 # Static configurations for virtualenv caches.
 VIRTUALENV_LOC=".heroku/venv"
 LEGACY_TRIGGER="lib/python2.7"
@@ -145,10 +142,14 @@ bpwatch stop clear_old_venvs
 
 # Restore old artifacts from the cache.
 bpwatch start restore_cache
-  for dir in $CACHE_ENTRIES; do
+    mkdir -p .heroku
-    mkdir -p $(basename $dir)
+
-    cp -R $CACHE_DIR/$dir $dir &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/python .heroku/ &> /dev/null || true
-  done
+    cp -R $CACHE_DIR/.heroku/python-stack .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/python-version .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/vendor .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/venv .heroku/ &> /dev/null || true
+
 bpwatch stop restore_cache
 
 set +e
@@ -210,11 +211,20 @@ bpwatch stop post_compile
 
 # Store new artifacts in cache.
 bpwatch start dump_cache
-  for dir in $CACHE_ENTRIES; do
+
-    rm -rf $CACHE_DIR/$dir
+  rm -rf $CACHE_DIR/.heroku/python
-    mkdir -p $(dirname $CACHE_DIR/$dir)
+  rm -rf $CACHE_DIR/.heroku/python-version
-    cp -R $dir $CACHE_DIR/$dir
+  rm -rf $CACHE_DIR/.heroku/python-stack
-  done
+  rm -rf $CACHE_DIR/.heroku/vendor
+  rm -rf $CACHE_DIR/.heroku/venv
+
+  mkdir -p $CACHE_DIR/.heroku
+  cp -R .heroku/python $CACHE_DIR/.heroku/
+  cp -R .heroku/python-version $CACHE_DIR/.heroku/
+  cp -R .heroku/python-stack $CACHE_DIR/.heroku/
+  cp -R .heroku/vendor $CACHE_DIR/.heroku/ &> /dev/null || true
+  cp -R .heroku/venv $CACHE_DIR/.heroku/ &> /dev/null || true
+
 bpwatch stop dump_cache
 
 # ### Fin.

builds/runtimes/pypy-4.0.0

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+# NOTICE: This formula only works for the cedar-14 stack, not cedar.
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.0-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-4.0.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python