From c0571d86bfa15d19efe66f4c7640ac6105fc6e9f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz <me@kennethreitz.org> Date: Tue, 20 Dec 2016 13:39:26 -0500 Subject: [PATCH] don't fail --- CHANGELOG.md | 4 ++++ bin/steps/pip-install | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8467618..bc463f75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Python Buildpack Changelog +## v93 + +Improved support for PyPy. + ## v92 Improved cache functionality and fix egg-links regression. diff --git a/bin/steps/pip-install b/bin/steps/pip-install index ffea9130..50a029f9 100755 --- a/bin/steps/pip-install +++ b/bin/steps/pip-install @@ -1,13 +1,17 @@ # Install dependencies with Pip. puts-cmd "pip install -r requirements.txt" +set +e # rewrite any existing egg links to point to the build dir so pip does not fail with a mismatch error find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -print0 | xargs -r -0 -n 1 sed -i -e "s#/app/#$(pwd)/#" find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" +set -e +set +e # Support for PyPy find .heroku/python/lib-python/*/site-packages/ -name "*.egg-link" -print0 | xargs -r -0 -n 1 sed -i -e "s#/app/#$(pwd)/#" find .heroku/python/lib-python/*/site-packages/ -name "*.pth" -print0 | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" +set -e [ ! "$FRESH_PYTHON" ] && bpwatch start pip_install [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first @@ -31,13 +35,16 @@ cp requirements.txt .heroku/python/requirements-declared.txt [ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install [ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first +set +e # rewrite build dir in egg links to /app so things are found at runtime find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -print0 | xargs -r -0 -n 1 sed -i -e "s#$(pwd)/#/app/#" find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 | xargs -r -0 -n 1 sed -i -e "s#$(pwd)/#/app/#" +set -e +set +e # Support for PyPy find .heroku/python/lib-python/*/site-packages/ -name "*.egg-link" -print0 | xargs -r -0 -n 1 sed -i -e "s#$(pwd)/#/app/#" find .heroku/python/lib-python/*/site-packages/ -name "*.pth" -print0 | xargs -r -0 -n 1 sed -i -e "s#$(pwd)/#/app/#" - +set -e echo -- GitLab