mirror of
https://github.com/kennethreitz/heroku-buildpack-python.git
synced 2026-06-05 23:10:16 +00:00
Merge pull request #61 from gulopine/already-satisfied
Clean up output of virtualenv setup
This commit is contained in:
+7
-2
@@ -72,6 +72,11 @@ indent() {
|
||||
[ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE"
|
||||
}
|
||||
|
||||
# Clean up pip output
|
||||
cleanup() {
|
||||
sed -e '/already satisfied/Id'
|
||||
}
|
||||
|
||||
# Virtualenv wrapper.
|
||||
function virtualenv (){
|
||||
python "$ROOT_DIR/vendor/virtualenv-1.7.2/virtualenv.py" "$@"
|
||||
@@ -201,12 +206,12 @@ source $VIRTUALENV_LOC/bin/activate
|
||||
|
||||
# Install Mercurial if it appears to be required.
|
||||
if (grep -Fiq "hg+" requirements.txt) then
|
||||
pip install --use-mirrors mercurial | indent
|
||||
pip install --use-mirrors mercurial | cleanup | indent
|
||||
fi
|
||||
|
||||
# Install dependencies with Pip.
|
||||
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.
|
||||
# Optionally, disable all Django-specific changes with `DISABLE_INJECTION` env.
|
||||
|
||||
Reference in New Issue
Block a user