diff --git a/bin/compile b/bin/compile index c300c77e9a8719a95a2cea7251733720308e1c1d..8c02c76288b29b1e36587c3b986f1a6881f431f2 100755 --- a/bin/compile +++ b/bin/compile @@ -27,14 +27,9 @@ BUILD_DIR=$1 CACHE_DIR=$2 ENV_DIR=$3 -# Static configurations for virtualenv caches. -VIRTUALENV_LOC=".heroku/venv" -LEGACY_TRIGGER="lib/python2.7" - DEFAULT_PYTHON_VERSION="python-2.7.13" DEFAULT_PYTHON_STACK="cedar-14" PYTHON_EXE="/app/.heroku/python/bin/python" -PIP_VERSION="9.0.1" # Common Problem Warnings export WARNINGS_LOG=$(mktemp) @@ -46,7 +41,7 @@ export PATH=$PATH:$ROOT_DIR/vendor/ # Setup pip-pop (pip-diff) export PATH=$PATH:$ROOT_DIR/vendor/pip-pop -# Support Anvil Build_IDs +# Support for other platforms. [ ! "$SLUG_ID" ] && SLUG_ID="defaultslug" [ ! "$REQUEST_ID" ] && REQUEST_ID=$SLUG_ID [ ! "$STACK" ] && STACK=$DEFAULT_PYTHON_STACK @@ -118,10 +113,6 @@ fi # Prepare the cache. mkdir -p $CACHE_DIR -# Purge "old-style" virtualenvs. -[ -d $CACHE_DIR/$LEGACY_TRIGGER ] && rm -fr $CACHE_DIR/.heroku/bin $CACHE_DIR/.heroku/lib $CACHE_DIR/.heroku/include -[ -d $CACHE_DIR/$VIRTUALENV_LOC ] && rm -fr $CACHE_DIR/.heroku/venv $CACHE_DIR/.heroku/src - # Restore old artifacts from the cache. mkdir -p .heroku @@ -224,7 +215,6 @@ rm -rf $CACHE_DIR/.heroku/python rm -rf $CACHE_DIR/.heroku/python-version rm -rf $CACHE_DIR/.heroku/python-stack rm -rf $CACHE_DIR/.heroku/vendor -rm -rf $CACHE_DIR/.heroku/venv rm -rf $CACHE_DIR/.heroku/src mkdir -p $CACHE_DIR/.heroku @@ -232,7 +222,6 @@ cp -R .heroku/python $CACHE_DIR/.heroku/ cp -R .heroku/python-version $CACHE_DIR/.heroku/ cp -R .heroku/python-stack $CACHE_DIR/.heroku/ &> /dev/null || true cp -R .heroku/vendor $CACHE_DIR/.heroku/ &> /dev/null || true -cp -R .heroku/venv $CACHE_DIR/.heroku/ &> /dev/null || true if [[ -d .heroku/src ]]; then cp -R .heroku/src $CACHE_DIR/.heroku/ &> /dev/null || true fi