Skip to content
Snippets Groups Projects
Commit ddf353cf authored by Marty Alchin's avatar Marty Alchin
Browse files

Clean up output of virtualenv setup

parent 160497cb
No related branches found
No related tags found
No related merge requests found
...@@ -72,6 +72,11 @@ indent() { ...@@ -72,6 +72,11 @@ indent() {
[ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE" [ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE"
} }
# Clean up pip output
cleanup() {
sed -e '/already satisfied/Id'
}
# Virtualenv wrapper. # Virtualenv wrapper.
function virtualenv (){ function virtualenv (){
python "$ROOT_DIR/vendor/virtualenv-1.7.2/virtualenv.py" "$@" python "$ROOT_DIR/vendor/virtualenv-1.7.2/virtualenv.py" "$@"
...@@ -201,12 +206,12 @@ source $VIRTUALENV_LOC/bin/activate ...@@ -201,12 +206,12 @@ source $VIRTUALENV_LOC/bin/activate
# 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 | indent pip install --use-mirrors mercurial | cleanup | indent
fi fi
# Install dependencies with Pip. # Install dependencies with Pip.
puts-step "Installing dependencies using pip version $(pip --version | awk '{print $2}')" puts-step "Installing dependencies using pip version $(pip --version | awk '{print $2}')"
pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | indent pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | cleanup | indent
# Do additional application hackery if applications appears to be a Django app. # Do additional application hackery if applications appears to be a Django app.
# Optionally, disable all Django-specific changes with `DISABLE_INJECTION` env. # Optionally, disable all Django-specific changes with `DISABLE_INJECTION` env.
......
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