setuptools v18.1

Revert "Update Readme.md"

CHANGELOG.md

@@ -0,0 +1,17 @@
+# Python Buildpack Changelog
+
+## v61 (2015-06-30)
+
+Updated Pip and Distribute. 
+
+- 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.

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
 
@@ -26,11 +28,11 @@ 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.9"
+DEFAULT_PYTHON_VERSION="python-2.7.10"
 DEFAULT_PYTHON_STACK="cedar"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="6.1.1"
-SETUPTOOLS_VERSION="15.2"
+PIP_VERSION="7.1.0"
+SETUPTOOLS_VERSION="18.1"
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch

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

bin/steps/pip-install

@@ -4,7 +4,7 @@ puts-step "Installing dependencies with pip"
 [ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
 [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
 
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --allow-all-external  | cleanup | indent
+/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --allow-all-external --disable-pip-version-check --no-cache-dir | cleanup | indent
 
 # Smart Requirements handling
 cp requirements.txt .heroku/python/requirements-declared.txt

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/python-2.7.10

@@ -0,0 +1,15 @@
+#!/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/2.7.10/Python-2.7.10.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7.10 src
+cd src
+
+./configure --prefix=$OUT_PREFIX  --with-ensurepip=no
+make
+make install

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