Compare commits

...

2 Commits

Author SHA1 Message Date
Kenneth Reitz a26f0374ec setuptools sanity check 2014-08-01 18:16:54 -04:00
Kenneth Reitz a0029a8411 suppress pip-grep errors 2014-08-01 18:10:15 -04:00
4 changed files with 16 additions and 2 deletions
+3
View File
@@ -150,6 +150,9 @@ mkdir -p $(dirname $PROFILE_PATH)
# Install Python. # Install Python.
source $BIN_DIR/steps/python source $BIN_DIR/steps/python
# Sanity check for setuptools/distribute.
source $BIN_DIR/steps/setuptools
# Uninstall removed dependencies with Pip. # Uninstall removed dependencies with Pip.
source $BIN_DIR/steps/pip-uninstall source $BIN_DIR/steps/pip-uninstall
+1 -1
View File
@@ -20,7 +20,7 @@ source $BIN_DIR/utils
bpwatch start libffi_install bpwatch start libffi_install
# If pylibmc exists within requirements, use vendored cryptography. # If pylibmc exists within requirements, use vendored cryptography.
if (pip-grep -s requirements.txt cffi pylibmc) then if (pip-grep -s requirements.txt cffi pylibmc &> /dev/null) then
if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
export LIBFFI=$(pwd)/vendor export LIBFFI=$(pwd)/vendor
+1 -1
View File
@@ -19,7 +19,7 @@ source $BIN_DIR/utils
bpwatch start pylibmc_install 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 &> /dev/null) then
if [ -d ".heroku/vendor/lib/sasl2" ]; then if [ -d ".heroku/vendor/lib/sasl2" ]; then
export LIBMEMCACHED=$(pwd)/vendor export LIBMEMCACHED=$(pwd)/vendor
+11
View File
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
# Syntax sugar.
source $BIN_DIR/utils
if (pip-grep -s requirements.txt setuptools distribute &> /dev/null) then
puts-warn 'The package setuptools/distribute is listed in requirements.txt.'
puts-warn 'Please remove to ensure expected behavior. '
fi