v68

This reverts commit 1e5ff1f8c9, reversing
changes made to 83538ca6ec.

CHANGELOG.md

@@ -0,0 +1,52 @@
+# 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)
+
+Reverted v64.
+
+## v64 (2015-10-08)
+
+Improved compatibility with multi and node.js buildpacks.
+
+## v63 (2015-10-08)
+
+Updated Pip and Setuptools.
+
+- Setuptools updated to v18.3.2
+- Pip updated to v7.1.2
+
+
+## v62 (2015-08-07)
+
+Updated Pip and Setuptools.
+
+- Setuptools updated to v18.1
+- Pip updated to v7.1.0
+
+## v61 (2015-06-30)
+
+Updated Pip and Setuptools.
+
+- Setuptools updated to v18.0.1
+- Pip updated to v7.0.3
+
+## v60 (2015-05-27)
+
+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
+

Changelog.md

@@ -1,130 +0,0 @@
-## v14
-
-Features:
-
-* Full removal of Django settings injection for new apps.
-* Support for profile.d
-* Fresh app detection.
-* Update to Virtualenv v1.7.2
-* Updated to Pip v1.1 (patched)
-
-Bugfixes:
-
-* Default pip path exists action.
-
-## v13
-
-Bugfixes:
-
-* Fix pip quoting error.
-* Only talk about collectstatic in buildpack output when it's configured.
-
-## v12
-
-Bugfixes:
-
-* Catch database setting corner case.
-
-## v11
-
-Bugfixes:
-
-* Cleanup collectstatic output.
-
-
-## v10
-
-Bugfixes:
-
-* Check for collectstatic validity with --dry-run instead of --help for Django 1.4.
-
-## 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:
-
-* Full removal of Django setting injection for new apps.
-* Automatic execution of collectstatic.
-* Suppress collectstatic errors via env SILENCE_COLLECTSTATIC.
-* Increase settings.py search depth to 3.
-* Search recursively from included requirements.txt files.
-
-
-## v6 (03/23/2012)
-
-Features:
-
-* Dist packages (setup.py) support.
-* Move new virtualenvs to `/app/.heroku/venv`.
-* Heavily improved Django app detection, accounting for `Django` in `requirements.txt`.
-* Literate [documentation](http://python-buildpack.herokuapp.com).
-* Default `$PYTHONHOME`, `$PYTHONPATH`, and `$LANG` configurations.
-* Disable Django setting injection with `$DISABLE_INJECTION` + [user_env_compile](http://devcenter.heroku.com/articles/labs-user-env-compile).
-* General code refactor and improved messaging.
-* Unit tests.
-
-Bugfixes:
-
-* Django 1.4 startproject template layout support.
-* Django `manage.py` location can now be independent from `settings.py`.
-
-## v5 (02/01/2012)
-
-Bugfixes:
-
-* Git requirements 100% work.
-
-
-## v4 (01/20/2012)
-
-Features:
-
-* Updated to virtualenv v1.7 with patched pip v1.2.
-* Actually activate created virtualenv within compile process.
-* Use distribute instead of deprecated setuptools.
-* Automatically destroy and rebuild corrupt virtualenvs.
-* Refactor django and pylibmc detection.
-
-Bugfixes:
-
-* Fixed `package==dev` in requirements with patched pip embedded within virtualenv. Patch upstreamed.
-* Minor curl/rm flag fixes (thanks, contributors!)
-
-
-## v3 (12/07/2011)
-
-Bugfixes:
-
-* Better django setup.py injection.
-
-
-## v2 (11/15/2011)
-
-Features:
-
-* Support for pylibmc and libmemcached +sasl.
-
-Bugfixes:
-
-* Detect when virtualenv is checked in and alert user.
-
-
-## v1 (10/01/2011)
-
-* Conception.

Readme.md

@@ -1,5 +1,5 @@
-Heroku buildpack: Python
-========================
+# Heroku buildpack: Python
+![python-banner](https://cloud.githubusercontent.com/assets/51578/8914205/ecf2047c-346b-11e5-98c5-42547f9f4410.jpg)
 
 This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](http://www.pip-installer.org/).
 
@@ -17,7 +17,7 @@ Example usage:
     $ git push heroku master
     ...
     -----> Python app detected
-    -----> Installing runtime (python-2.7.9)
+    -----> Installing runtime (python-2.7.10)
     -----> Installing dependencies using pip
            Downloading/unpacking requests (from -r requirements.txt (line 1))
            Installing collected packages: requests
@@ -40,13 +40,13 @@ Specify a Runtime
 You can also provide arbitrary releases Python with a `runtime.txt` file.
 
     $ cat runtime.txt
-    python-3.4.3
+    python-3.5.0
 
 Runtime options include:
 
-- python-2.7.9
-- python-3.4.3
-- pypy-2.4.0 (unsupported, experimental)
+- python-2.7.10
+- python-3.5.0
+- pypy-2.6.1 (unsupported, experimental)
 - pypy3-2.4.0 (unsupported, experimental)
 
 Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well.

bin/compile

@@ -7,6 +7,8 @@
 # Fail fast and fail hard.
 set -eo pipefail
 
+[ "$BUILDPACK_XTRACE" ] && set -o xtrace
+
 # Prepend proper path for virtualenv hackery. This will be deprecated soon.
 export PATH=:/usr/local/bin:$PATH
 
@@ -18,19 +20,17 @@ 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"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="7.0.1"
-SETUPTOOLS_VERSION="16.0"
+PIP_VERSION="7.1.2"
+SETUPTOOLS_VERSION="18.3.2"
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
@@ -55,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
 
@@ -81,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
 
@@ -90,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
@@ -142,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
 
@@ -206,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
 
@@ -216,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
 

bin/steps/cryptography

@@ -20,7 +20,7 @@ source $BIN_DIR/utils
 bpwatch start libffi_install
 
 # If pylibmc exists within requirements, use vendored cryptography.
-if (pip-grep -s requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL &> /dev/null) then
+if (pip-grep -s requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL requests[security] &> /dev/null) then
 
   if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
     export LIBFFI=$(pwd)/vendor

builds/runtimes/pypy-2.6.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-2.6.0-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-2.6.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-2.6.1

@@ -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-2.6.1-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-2.6.1-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/python-3.5.0

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building Python..."
+SOURCE_TARBALL='https://python.org/ftp/python/3.5.0/Python-3.5.0.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.5.0 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+

vendor/python.webconcurrency.sh

@@ -12,10 +12,16 @@ case $(ulimit -u) in
   export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
   ;;
 
+# IX DYNO
+16384)
+  export DYNO_RAM=2560
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8}
+  ;;
+
 # PX DYNO
 32768)
-  export DYNO_RAM=6144
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-9}
+  export DYNO_RAM=6656
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11}
   ;;
 
 esac