Skip to content
Snippets Groups Projects
Commit cbb7512c authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files

cleanup build output a bit

parent 869576e8
No related branches found
No related tags found
No related merge requests found
...@@ -101,7 +101,6 @@ bpwatch stop pre_compile ...@@ -101,7 +101,6 @@ bpwatch stop pre_compile
# If no requirements given, assume `setup.py develop`. # If no requirements given, assume `setup.py develop`.
if [ ! -f requirements.txt ]; then if [ ! -f requirements.txt ]; then
puts-step "No requirements.txt provided; assuming dist package."
echo "-e ." > requirements.txt echo "-e ." > requirements.txt
fi fi
...@@ -152,7 +151,7 @@ PYTHON_VERSION=$(cat runtime.txt) ...@@ -152,7 +151,7 @@ PYTHON_VERSION=$(cat runtime.txt)
if [ -f .heroku/python-version ]; then if [ -f .heroku/python-version ]; then
if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
bpwatch start uninstall_python bpwatch start uninstall_python
puts-step "Found $(cat .heroku/python-version), removing." puts-step "Found runtime $(cat .heroku/python-version), removing"
rm -fr .heroku/python rm -fr .heroku/python
bpwatch stop uninstall_python bpwatch stop uninstall_python
else else
...@@ -162,7 +161,7 @@ fi ...@@ -162,7 +161,7 @@ fi
if [ ! $STACK = $CACHED_PYTHON_STACK ]; then if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
bpwatch start uninstall_python bpwatch start uninstall_python
puts-step "Stack changed, re-installing $PYTHON_VERSION." puts-step "Stack changed, re-installing runtime ($PYTHON_VERSION)"
rm -fr .heroku/python rm -fr .heroku/python
unset SKIP_INSTALL unset SKIP_INSTALL
bpwatch stop uninstall_python bpwatch stop uninstall_python
...@@ -171,14 +170,14 @@ fi ...@@ -171,14 +170,14 @@ fi
if [ ! "$SKIP_INSTALL" ]; then if [ ! "$SKIP_INSTALL" ]; then
bpwatch start install_python bpwatch start install_python
puts-step "Preparing Python runtime ($PYTHON_VERSION)" puts-step "Installing runtime ($PYTHON_VERSION)"
# Prepare destination directory. # Prepare destination directory.
mkdir -p .heroku/python mkdir -p .heroku/python
curl http://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null curl http://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
puts-warn "Requested runtime ($PYTHON_VERSION) is not available on the $STACK stack." 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" puts-warn "Aborting. More info: https://devcenter.heroku.com/articles/python-support"
exit 1 exit 1
fi fi
...@@ -191,8 +190,6 @@ if [ ! "$SKIP_INSTALL" ]; then ...@@ -191,8 +190,6 @@ if [ ! "$SKIP_INSTALL" ]; then
FRESH_PYTHON=true FRESH_PYTHON=true
hash -r hash -r
else
puts-step "Using Python runtime ($PYTHON_VERSION)"
fi fi
# If Pip isn't up to date: # If Pip isn't up to date:
...@@ -203,7 +200,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then ...@@ -203,7 +200,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
bpwatch start install_setuptools bpwatch start install_setuptools
# Prepare it for the real world # Prepare it for the real world
puts-step "Installing Setuptools ($SETUPTOOLS_VERSION)" # puts-step "Installing Setuptools ($SETUPTOOLS_VERSION)"
cd $ROOT_DIR/vendor/ cd $ROOT_DIR/vendor/
tar zxf setuptools-$SETUPTOOLS_VERSION.tar.gz tar zxf setuptools-$SETUPTOOLS_VERSION.tar.gz
cd $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION/ cd $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION/
...@@ -212,7 +209,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then ...@@ -212,7 +209,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
bpwatch stop install_setuptoools bpwatch stop install_setuptoools
bpwatch start install_pip bpwatch start install_pip
puts-step "Installing Pip ($PIP_VERSION)" # puts-step "Installing Pip ($PIP_VERSION)"
cd $ROOT_DIR/vendor/ cd $ROOT_DIR/vendor/
tar zxf pip-$PIP_VERSION.tar.gz tar zxf pip-$PIP_VERSION.tar.gz
...@@ -241,7 +238,7 @@ if (grep -Fiq "hg+" requirements.txt) then ...@@ -241,7 +238,7 @@ if (grep -Fiq "hg+" requirements.txt) then
fi fi
# Install dependencies with Pip. # Install dependencies with Pip.
puts-step "Installing dependencies using Pip ($PIP_VERSION)" puts-step "Installing dependencies with Pip ($PIP_VERSION)"
[ ! "$FRESH_PYTHON" ] && bpwatch start pip_install [ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment