Merge remote-tracking branch 'origin/master'

Readme.md

@@ -17,7 +17,7 @@ Example usage:
     $ git push heroku master
     ...
     -----> Python app detected
-    -----> Installing runtime (python-2.7.8)
+    -----> Installing runtime (python-2.7.9)
     -----> Installing dependencies using pip
            Downloading/unpacking requests (from -r requirements.txt (line 1))
            Installing collected packages: requests
@@ -40,12 +40,12 @@ Specify a Runtime
 You can also provide arbitrary releases Python with a `runtime.txt` file.
 
     $ cat runtime.txt
-    python-3.4.2
+    python-3.4.3
 
 Runtime options include:
 
-- python-2.7.8
-- python-3.4.2
+- python-2.7.9
+- python-3.4.3
 - pypy-2.4.0 (unsupported, experimental)
 - pypy3-2.4.0 (unsupported, experimental)
 

bin/compile

@@ -29,7 +29,7 @@ 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="6.0.6"
+PIP_VERSION="6.0.8"
 SETUPTOOLS_VERSION="11.3.1"
 
 # Setup bpwatch

bin/utils

@@ -68,7 +68,7 @@ deep-rm() {
   # subshell to avoid surprising caller with shopts.
   (
     shopt -s dotglob
-    rm -rf "$1"/!(tmp|.|..)
+    rm -rf "$1"/!(.curlrc|.netrc|tmp|.|..)
   )
 }