WEBCONCURRENCY_PROFILE_PATH

Update Readme.md to pypy3-2.4.0

Readme.md

@@ -47,6 +47,6 @@ Runtime options include:
 - python-2.7.8
 - python-3.4.2
 - pypy-2.4.0 (unsupported, experimental)
-- pypy3-2.3.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

@@ -24,12 +24,13 @@ CACHED_DIRS=".heroku"
 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.9"
 DEFAULT_PYTHON_STACK="cedar"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="1.5.6"
-SETUPTOOLS_VERSION="7.0"
+PIP_VERSION="6.0.6"
+SETUPTOOLS_VERSION="11.3.1"
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
@@ -185,6 +186,9 @@ set-default-env LANG en_US.UTF-8
 set-default-env PYTHONHASHSEED random
 set-default-env PYTHONPATH /app/
 
+# Install sane-default script for WEB_CONCURRENCY environment variable.
+cp $ROOT_DIR/vendor/python.webconcurrency.sh $WEBCONCURRENCY_PROFILE_PATH
+
 
 # Experimental post_compile hook.
 bpwatch start post_compile

bin/steps/python

@@ -16,7 +16,7 @@ fi
 if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
   bpwatch start uninstall_python
     puts-step "Stack changed, re-installing runtime"
-    rm -fr .heroku/python
+    rm -fr .heroku/python .heroku/python-stack .heroku/vendor
     unset SKIP_INSTALL
   bpwatch stop uninstall_python
 fi

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

vendor/pip-pop/pip-diff

@@ -14,6 +14,9 @@ import os
 from docopt import docopt
 from pip.req import parse_requirements
 from pip.index import PackageFinder
+from pip._vendor.requests import session
+
+requests = session()
 
 class Requirements(object):
     def __init__(self, reqfile=None):
@@ -32,8 +35,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        finder = PackageFinder([], [])
-        for requirement in parse_requirements(reqfile, finder=finder):
+        finder = PackageFinder([], [], session=requests)
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             if requirement.req:
                 self.requirements.append(requirement.req)
 

vendor/pip-pop/pip-grep

@@ -11,7 +11,9 @@ import os
 from docopt import docopt
 from pip.req import parse_requirements
 from pip.index import PackageFinder
+from pip._vendor.requests import session
 
+requests = session()
 
 class Requirements(object):
     def __init__(self, reqfile=None):
@@ -30,8 +32,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        finder = PackageFinder([], [])
-        for requirement in parse_requirements(reqfile, finder=finder):
+        finder = PackageFinder([], [], session=requests)
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             self.requirements.append(requirement)
 
 

vendor/python.webconcurrency.sh

@@ -0,0 +1,21 @@
+case $(ulimit -u) in
+
+# 1X DYNO
+256)
+  export DYNO_RAM=512
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2}
+  ;;
+
+# 2X DYNO
+512)
+  export DYNO_RAM=1024
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
+  ;;
+
+# PX DYNO
+32768)
+  export DYNO_RAM=8192
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-9}
+  ;;
+
+esac