kennethreitz/heroku-buildpack-python
1
0
Fork 0
mirror of https://github.com/kennethreitz/heroku-buildpack-python.git synced 2026-06-05 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grep bug fix (#456)

Browse Source 
* fixed the bug for pypy-5.8.0

* changelog entry

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* use std-lib sub-env

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* let's see if this cleans things up

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* try v7 of stdlib

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* use new sub_env

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* set_env

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* set_default_env

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* v8 of stdlib

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* v112

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* oops (merge bug)

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* final merge error resolve

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* final final fix for merge conflict

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
This commit is contained in:
Kenneth Reitz
2017-08-28 13:41:32 -04:00
committed by GitHub
parent 845635d667
commit 155b5eecb9
7 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/steps/hooks/post_compile
+1 -1
View File
@@ -3,5 +3,5 @@
if [ -f bin/post_compile ]; then
echo "-----> Running post-compile hook"
chmod +x bin/post_compile
sub-env bin/post_compile
sub_env bin/post_compile
fi
bin/steps/hooks/pre_compile
+1 -1
View File
@@ -3,5 +3,5 @@
if [ -f bin/pre_compile ]; then
echo "-----> Running pre-compile hook"
chmod +x bin/pre_compile
sub-env bin/pre_compile
sub_env bin/pre_compile
fi
bin/steps/nltk
+1 -1
View File
@@ -25,7 +25,7 @@ if sp-grep -s nltk; then
puts-step "Downloading NLTK packages: $nltk_packages"
python -m nltk.downloader -d "$BUILD_DIR/.heroku/python/nltk_data" "$nltk_packages" | indent
set-env NLTK_DATA "/app/.heroku/python/nltk_data"
set_env NLTK_DATA "/app/.heroku/python/nltk_data"
else
puts-warn "'nltk.txt' not found, not downloading any corpora"
bin/steps/pip-install
+1 -1
View File
@@ -6,7 +6,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
puts-step "Installing requirements with pip"
set +e
sub-env /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
sub_env /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
PIP_STATUS="${PIPESTATUS[0]}"
set -e