Compare commits

...

9 Commits

Author SHA1 Message Date
Kenneth Reitz 8740fcdbad bugfix! 2014-08-01 16:49:08 -04:00
Kenneth Reitz fb18948243 Merge branch 'master' into pylibmc 2014-08-01 16:40:39 -04:00
Kenneth Reitz e104d36785 sub-env 2014-08-01 16:37:00 -04:00
Kenneth Reitz 1786231a49 move requirements to home directory first. 2014-08-01 16:34:53 -04:00
Kenneth Reitz fa8e09ae9c debug 2014-08-01 16:05:57 -04:00
Kenneth Reitz 2dd212d020 silence untar 2014-08-01 16:03:45 -04:00
Kenneth Reitz 15acd305d1 mkdir -p 2014-08-01 16:02:32 -04:00
Kenneth Reitz 5a65a39c5e sub-env, not source 2014-08-01 15:57:24 -04:00
Kenneth Reitz f18754f8f0 pylibmc attempt 2014-08-01 15:46:14 -04:00
3 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -163,7 +163,7 @@ source $BIN_DIR/steps/pylibmc
source $BIN_DIR/steps/pip-install source $BIN_DIR/steps/pip-install
# Django collectstatic support. # Django collectstatic support.
source $BIN_DIR/steps/collectstatic sub-env $BIN_DIR/steps/collectstatic
# ### Finalize # ### Finalize
+5 -1
View File
@@ -3,7 +3,11 @@ set +e
bpwatch start pip_uninstall bpwatch start pip_uninstall
if [[ -f .heroku/python/requirements-declared.txt ]]; then if [[ -f .heroku/python/requirements-declared.txt ]]; then
pip-diff --stale .heroku/python/requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt cp .heroku/python/requirements-declared.txt requirements-declared.txt
pip-diff --stale requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
rm -fr requirements-declared.txt
if [[ -s .heroku/python/requirements-stale.txt ]]; then if [[ -s .heroku/python/requirements-stale.txt ]]; then
puts-step "Uninstalling stale dependencies" puts-step "Uninstalling stale dependencies"
+5 -9
View File
@@ -10,7 +10,7 @@
# This script is invoked by [`bin/compile`](/). # This script is invoked by [`bin/compile`](/).
# The location of the pre-compiled libmemcached binary. # The location of the pre-compiled libmemcached binary.
VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz" VENDORED_MEMCACHED="http://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
# Syntax sugar. # Syntax sugar.
source $BIN_DIR/utils source $BIN_DIR/utils
@@ -19,21 +19,17 @@ bpwatch start pylibmc_install
# If pylibmc exists within requirements, use vendored libmemcached. # If pylibmc exists within requirements, use vendored libmemcached.
if (pip-grep -s requirements.txt pylibmc) then if (pip-grep -s requirements.txt pylibmc) then
echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
cd .heroku
if [ -d "vendor/lib/sasl2" ]; then if [ -d "vendor/lib/sasl2" ]; then
export LIBMEMCACHED=$(pwd)/vendor export LIBMEMCACHED=$(pwd)/vendor
else else
echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
mkdir -p .heroku/vendor
# Download and extract libmemcached into target vendor directory. # Download and extract libmemcached into target vendor directory.
curl -s -L -o tmp-libmemcached.tar.gz $VENDORED_MEMCACHED curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
tar -zxvf tmp-libmemcached.tar.gz > /dev/null
rm tmp-libmemcached.tar.gz
export LIBMEMCACHED=$(pwd)/vendor export LIBMEMCACHED=$(pwd)/vendor
fi fi
export LIBMEMCACHED=$(pwd)/vendor
cd ..
fi fi
bpwatch stop pylibmc_install bpwatch stop pylibmc_install