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

fixes and cleanups

parent 35345d11
No related branches found
No related tags found
No related merge requests found
...@@ -137,12 +137,12 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then ...@@ -137,12 +137,12 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
# Prepare it for the real world # Prepare it for the real world
puts-step "Installing Distribute ($DISTRIBUTE_VERSION)" puts-step "Installing Distribute ($DISTRIBUTE_VERSION)"
cd $ROOT_DIR/vendor/distribute-$DISTRIBUTE_VERSION/ cd $ROOT_DIR/vendor/distribute-$DISTRIBUTE_VERSION/
python setup.py install # &> /dev/null python setup.py install &> /dev/null
cd $WORKING_DIR cd $WORKING_DIR
puts-step "Installing Pip ($PIP_VERSION)" puts-step "Installing Pip ($PIP_VERSION)"
cd $ROOT_DIR/vendor/pip-$PIP_VERSION/ cd $ROOT_DIR/vendor/pip-$PIP_VERSION/
python setup.py install # &> /dev/null python setup.py install &> /dev/null
cd $WORKING_DIR cd $WORKING_DIR
fi fi
...@@ -155,12 +155,12 @@ source $BIN_DIR/steps/pylibmc ...@@ -155,12 +155,12 @@ source $BIN_DIR/steps/pylibmc
# Install Mercurial if it appears to be required. # Install Mercurial if it appears to be required.
if (grep -Fiq "hg+" requirements.txt) then if (grep -Fiq "hg+" requirements.txt) then
pip install --use-mirrors mercurial | cleanup | indent /app/.heroku/python/bin/pip install --use-mirrors mercurial | cleanup | indent
fi fi
# Install dependencies with Pip. # Install dependencies with Pip.
puts-step "Installing dependencies using Pip ($PIP_VERSION)" puts-step "Installing dependencies using Pip ($PIP_VERSION)"
pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | cleanup | indent /app/.heroku/python/bin/pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | cleanup | indent
# Django collectstatic support. # Django collectstatic support.
source $BIN_DIR/steps/collectstatic source $BIN_DIR/steps/collectstatic
......
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