diff --git a/bin/compile b/bin/compile index af47b6f0366dee2957a575d94e52d0061a52c338..0ef5bc6676face350e54a869690b30e3051d1425 100755 --- a/bin/compile +++ b/bin/compile @@ -27,6 +27,9 @@ BUILD_DIR=$1 CACHE_DIR=$2 ENV_DIR=$3 +# Export path environment variables for sub-scripts. +export BIN_DIR ROOT_DIR BUILD_DIR CACHE_DIR ENV_DIR + DEFAULT_PYTHON_VERSION="python-2.7.13" DEFAULT_PYTHON_STACK="cedar-14" PYTHON_EXE="/app/.heroku/python/bin/python" diff --git a/bin/steps/pip-install b/bin/steps/pip-install index 38aae64c3768fc3ca4a818208d4353bef9e1f7a8..ed5798da450597326bf39be7a1415dcea31c1b7c 100755 --- a/bin/steps/pip-install +++ b/bin/steps/pip-install @@ -4,7 +4,8 @@ puts-cmd "pip install -r requirements.txt" [ ! "$FRESH_PYTHON" ] && bpwatch start pip_install [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first - +# Change directory to /app for pip. +cd /app set +e /app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent @@ -25,4 +26,5 @@ cp requirements.txt .heroku/python/requirements-declared.txt [ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install [ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first +cd $BUILD_DIR echo