Commit ea27b5a7 authored by Kenneth Reitz's avatar Kenneth Reitz

proper installations

parent 18c19e44
...@@ -145,11 +145,25 @@ if [ ! "$SKIP_INSTALL" ]; then ...@@ -145,11 +145,25 @@ if [ ! "$SKIP_INSTALL" ]; then
# Record for future reference. # Record for future reference.
echo $PYTHON_VERSION > .heroku/python-version echo $PYTHON_VERSION > .heroku/python-version
WORKING_DIR=$(pwd)
# Prepare it for the real world # Prepare it for the real world
puts-step "Installing Distribute (0.6.32)"
cd $ROOT_DIR/vendor/distribute-0.6.32/
python setup.py install &> /dev/null
cd $WORKING_DIR
puts-step "Installing pip (1.2.1)"
cd $ROOT_DIR/vendor/pip-1.2.1/
python setup.py install &> /dev/null
cd $WORKING_DIR
hash -r hash -r
python $ROOT_DIR/vendor/distribute-0.6.32/distribute_setup.py &> /dev/null # python $ROOT_DIR/vendor/distribute-0.6.32/distribute_setup.py &> /dev/null
hash -r # hash -r
easy_install $ROOT_DIR/vendor/pip-1.2.1.tar.gz &> /dev/null # easy_install $ROOT_DIR/vendor/pip-1.2.1.tar.gz &> /dev/null
else
puts-step "Using Python runtime ($PYTHON_VERSION)"
fi fi
set -e set -e
...@@ -164,7 +178,7 @@ if (grep -Fiq "hg+" requirements.txt) then ...@@ -164,7 +178,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 | awk '{print $2}'))" puts-step "Installing dependencies using pip (1.2.1)"
pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | cleanup | indent pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | cleanup | indent
# Django collectstatic support. # Django collectstatic support.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment