mirror of
https://github.com/kennethreitz/heroku-buildpack-python.git
synced 2026-06-05 15:00:19 +00:00
Grep bug fix (#456)
* 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:
GitHub
+7
-1
@@ -1,8 +1,14 @@
|
||||
# Python Buildpack Changelog
|
||||
|
||||
# 112
|
||||
|
||||
Bugfix.
|
||||
|
||||
- Fixed grep output bug.
|
||||
|
||||
# 111
|
||||
|
||||
Linting , bugfixes.
|
||||
Linting, bugfixes.
|
||||
|
||||
# 110
|
||||
|
||||
|
||||
+11
-11
@@ -182,7 +182,7 @@ source "$BIN_DIR/steps/cryptography"
|
||||
|
||||
# Support for Geo libraries.
|
||||
# shellcheck source=bin/steps/geo-libs
|
||||
sub-env "$BIN_DIR/steps/geo-libs"
|
||||
sub_env "$BIN_DIR/steps/geo-libs"
|
||||
|
||||
# GDAL support.
|
||||
# shellcheck source=bin/steps/gdal
|
||||
@@ -202,7 +202,7 @@ mtime "pip.install.time" "${start}"
|
||||
|
||||
# Support for NLTK corpora.
|
||||
let start=$(nowms)
|
||||
sub-env "$BIN_DIR/steps/nltk"
|
||||
sub_env "$BIN_DIR/steps/nltk"
|
||||
mtime "nltk.download.time" "${start}"
|
||||
|
||||
# Support for pip install -e.
|
||||
@@ -215,20 +215,20 @@ fi
|
||||
|
||||
# Django collectstatic support.
|
||||
let start=$(nowms)
|
||||
sub-env "$BIN_DIR/steps/collectstatic"
|
||||
sub_env "$BIN_DIR/steps/collectstatic"
|
||||
mtime "collectstatic.time" "${start}"
|
||||
|
||||
# Create .profile script for application runtime environment variables.
|
||||
set-env PATH "\$HOME/.heroku/python/bin:\$PATH"
|
||||
set-env PYTHONUNBUFFERED true
|
||||
set-env PYTHONHOME /app/.heroku/python
|
||||
set_env PATH "\$HOME/.heroku/python/bin:\$PATH"
|
||||
set_env PYTHONUNBUFFERED true
|
||||
set_env PYTHONHOME /app/.heroku/python
|
||||
|
||||
set-env LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LIBRARY_PATH"
|
||||
set-env LD_LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LD_LIBRARY_PATH"
|
||||
set_env LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LIBRARY_PATH"
|
||||
set_env LD_LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LD_LIBRARY_PATH"
|
||||
|
||||
set-default-env LANG en_US.UTF-8
|
||||
set-default-env PYTHONHASHSEED random
|
||||
set-default-env PYTHONPATH /app/
|
||||
set_default_env LANG en_US.UTF-8
|
||||
set_default_env PYTHONHASHSEED random
|
||||
set_default_env PYTHONPATH /app/
|
||||
|
||||
# Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS.
|
||||
cp "$ROOT_DIR/vendor/WEB_CONCURRENCY.sh" "$WEB_CONCURRENCY_PROFILE_PATH"
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
+1
-1
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ shopt -s nullglob
|
||||
|
||||
# The standard library.
|
||||
if [[ ! -f /tmp/stdlib.sh ]]; then
|
||||
curl --retry 3 -s https://lang-common.s3.amazonaws.com/buildpack-stdlib/v2/stdlib.sh > /tmp/stdlib.sh
|
||||
curl --retry 3 -s https://lang-common.s3.amazonaws.com/buildpack-stdlib/v8/stdlib.sh > /tmp/stdlib.sh
|
||||
fi
|
||||
# shellcheck source=/dev/null
|
||||
source /tmp/stdlib.sh
|
||||
@@ -53,30 +53,6 @@ deep-cp() {
|
||||
}
|
||||
|
||||
|
||||
sub-env() {
|
||||
|
||||
WHITELIST=${2:-''}
|
||||
BLACKLIST=${3:-'^(GIT_DIR|STACK|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
|
||||
|
||||
# Python-specific variables.
|
||||
export PYHONHOME=$BUILD_DIR/.heroku/python
|
||||
export PYTHONPATH=$BUILD_DIR/
|
||||
|
||||
(
|
||||
if [ -d "$ENV_DIR" ]; then
|
||||
# shellcheck disable=SC2045
|
||||
for e in $(ls "$ENV_DIR"); do
|
||||
echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" &&
|
||||
export "$e=$(cat "$ENV_DIR/$e")"
|
||||
:
|
||||
done
|
||||
fi
|
||||
|
||||
"$@"
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
# Measure the size of the Python installation.
|
||||
measure-size() {
|
||||
echo "$(du -s .heroku/python 2>/dev/null || echo 0) | awk '{print $1}')"
|
||||
|
||||
Reference in New Issue
Block a user