Skip to content

H
heroku-buildpack-python
Commit 26dd3828 authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files
Options

Start Decoupled Pythons

parent ead7b1a0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
bin/compile
View file @ 26dd3828
...@@ -15,6 +15,7 @@ NAME=$($BIN_DIR/detect $BUILD_DIR) ...@@ -15,6 +15,7 @@ NAME=$($BIN_DIR/detect $BUILD_DIR)
PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-$CACHE_DIR/pip_downloads} PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-$CACHE_DIR/pip_downloads}
VIRTUALENV_DIRS="bin include lib" VIRTUALENV_DIRS="bin include lib"
VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz" VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz"
PYTHON_VERSION="2.7"
unset GIT_DIR unset GIT_DIR
export PIP_DOWNLOAD_CACHE export PIP_DOWNLOAD_CACHE
...@@ -54,10 +55,14 @@ done ...@@ -54,10 +55,14 @@ done
# Create virtualenv. Rebuild if corrupt. # Create virtualenv. Rebuild if corrupt.
set +e set +e
echo "-----> Preparing Python ($PYTHON_VERSION)"
PYTHON_EXE=$(python-build install $PYTHON_VERSION --quiet)
echo "-----> Preparing virtualenv version $(virtualenv --version)" echo "-----> Preparing virtualenv version $(virtualenv --version)"
# Try to create the virtualenv. # Try to create the virtualenv.
OUT=$(virtualenv --distribute --never-download --prompt=venv . 2>&1) OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt=venv . 2>&1)
# If there's an error, purge and recreate. # If there's an error, purge and recreate.
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
...@@ -65,7 +70,7 @@ OUT=$(virtualenv --distribute --never-download --prompt=venv . 2>&1) ...@@ -65,7 +70,7 @@ OUT=$(virtualenv --distribute --never-download --prompt=venv . 2>&1)
for dir in $VIRTUALENV_DIRS; do for dir in $VIRTUALENV_DIRS; do
rm -fr $dir &> /dev/null || true rm -fr $dir &> /dev/null || true
done done
OUT=$(virtualenv --distribute --never-download --prompt=venv . ) OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt=venv . )
} }
echo "$OUT" | indent echo "$OUT" | indent
......
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