mirror of
https://github.com/kennethreitz/heroku-buildpack-python.git
synced 2026-06-05 23:10:16 +00:00
Shellcheck Compliance (#438)
* fixed the bug for pypy-5.8.0 * enable shellcheck in makefile Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * make compile script shellcheck compatible Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * let's see what this says * fix pip installation Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck detect script * shellcheck release Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck test-compile Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck warnings/utils * updated makefile Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck collectstatic Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck cryptography Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck eggpath fixes Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck gdal * shellcheck goes-libs Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck mercurial Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * nltk shellcheck * shellcheck pip-install Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck pip-uninstall Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck pipenv Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck pylibmc Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * shellcheck python Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * update makefile Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * final update to makefile Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * fix tests Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * actually fix the tests Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * update pipenv-python-version Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * requested fixes Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * update spellcheck sources * attempted fix for shell globbing Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * further attempted fix Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * switch nltk styling Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * no more need for temp app for installing pip Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * attempt at staged build for shellcheck Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * attempted fix of travis file Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * reorder travis file * add shellcheck to install * make things clearer in travis file Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * better travis file Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * attempt at better travis file Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * better travis file Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
This commit is contained in:
GitHub
+9
-12
@@ -1,10 +1,12 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set +e
|
||||
runtime-fixer runtime.txt
|
||||
PYTHON_VERSION=$(cat runtime.txt)
|
||||
|
||||
# Install Python.
|
||||
if [ -f .heroku/python-version ]; then
|
||||
if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
|
||||
if [ ! "$(cat .heroku/python-version)" = "$PYTHON_VERSION" ]; then
|
||||
puts-step "Found $(cat .heroku/python-version), removing"
|
||||
rm -fr .heroku/python
|
||||
else
|
||||
@@ -12,7 +14,7 @@ if [ -f .heroku/python-version ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
|
||||
if [ ! "$STACK" = "$CACHED_PYTHON_STACK" ]; then
|
||||
rm -fr .heroku/python .heroku/python-stack .heroku/vendor
|
||||
unset SKIP_INSTALL
|
||||
fi
|
||||
@@ -24,29 +26,24 @@ if [ ! "$SKIP_INSTALL" ]; then
|
||||
# Prepare destination directory.
|
||||
mkdir -p .heroku/python
|
||||
|
||||
curl https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
|
||||
mcount "version.python.$PYTHON_VERSION"
|
||||
|
||||
if [[ $? != 0 ]] ; then
|
||||
if ! curl "https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz" -s | tar zxv -C .heroku/python &> /dev/null; then
|
||||
puts-warn "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
|
||||
puts-warn "Aborting. More info: https://devcenter.heroku.com/articles/python-support"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Record for future reference.
|
||||
echo $PYTHON_VERSION > .heroku/python-version
|
||||
echo $STACK > .heroku/python-stack
|
||||
echo "$PYTHON_VERSION" > .heroku/python-version
|
||||
echo "$STACK" > .heroku/python-stack
|
||||
FRESH_PYTHON=true
|
||||
|
||||
hash -r
|
||||
fi
|
||||
|
||||
# If Pip isn't up to date:
|
||||
if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
|
||||
WORKING_DIR=$(pwd)
|
||||
|
||||
TMPTARDIR=$(mktemp -d)
|
||||
trap "rm -rf $TMPTARDIR" RETURN
|
||||
if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then
|
||||
|
||||
puts-step "Installing pip"
|
||||
|
||||
@@ -54,7 +51,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
|
||||
rm -fr /app/.heroku/python/lib/python2.7/site-packages/pip-*
|
||||
rm -fr /app/.heroku/python/lib/python2.7/site-packages/setuptools-*
|
||||
|
||||
/app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py &> /dev/null
|
||||
/app/.heroku/python/bin/python "$ROOT_DIR/vendor/get-pip.py" &> /dev/null
|
||||
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user