From e8a79bbda5f2563300b7e5bc280ee4005629243f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz <me@kennethreitz.org> Date: Fri, 26 May 2017 07:22:52 -0700 Subject: [PATCH] fix for heroku ci (#392) * attempted fix * added a comment * fixes * improved changelog --- CHANGELOG.md | 10 ++++++++++ bin/compile | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e98497d..7dae77f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Python Buildpack Changelog +## 103 + +Bug fixes and improvements. + +- Fix for Pipenv. +- Fix for Heroku CI. +- Improve handling of WEB_CONCURRENCY when using multiple buildpacks. +- Adjust environment variables set during the build to more closely match those in the dyno environment (DYNO is now available, STACK is not). +- Restore the build cache prior to running bin/pre_compile. + ## 102 Buildpack code cleanup. diff --git a/bin/compile b/bin/compile index 5f8a2f7b..468cf727 100755 --- a/bin/compile +++ b/bin/compile @@ -192,8 +192,12 @@ sub-env $BIN_DIR/steps/nltk mtime "nltk.download.time" "${start}" # Support for pip install -e. -rm -fr $BUILD_DIR/.heroku/src -deep-cp /app/.heroku/src $BUILD_DIR/.heroku/src +# In CI, $BUILD_DIR is /app. +if [[ ! "$BUILD_DIR" == "/app" ]]; then + rm -fr $BUILD_DIR/.heroku/src + deep-cp /app/.heroku/src $BUILD_DIR/.heroku/src +fi + # Django collectstatic support. let start=$(nowms) -- GitLab