Merge pull request #142 from mdw-at-linuxbox/hammer-setupfix

Use non-broken version of setuptools, and fix bootstrap to be more po…
This commit is contained in:
Matt Benjamin 2017-01-26 12:06:00 -05:00 committed by GitHub
commit 65f711aaab

View file

@ -13,9 +13,18 @@ if [ -f /etc/debian_version ]; then
echo " sudo apt-get install $missing" echo " sudo apt-get install $missing"
exit 1 exit 1
fi fi
elif [ -f /etc/fedora-release ]; then
for package in python-pip python2-virtualenv python-devel libevent-devel; do
if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
missing="${missing:+$missing }$package"
fi fi
if [ -f /etc/redhat-release ]; then done
for package in python-pip python-virtualenv python-devel libevent-devel; do if [ -n "$missing" ]; then
echo "$0: missing required RPM packages. Installing via sudo." 1>&2
sudo yum -y install $missing
fi
elif [ -f /etc/redhat-release ]; then
for package in python2-pip python-virtualenv python-devel libevent-devel; do
if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
missing="${missing:+$missing }$package" missing="${missing:+$missing }$package"
fi fi
@ -32,8 +41,8 @@ virtualenv --no-site-packages --distribute virtualenv
# avoid pip bugs # avoid pip bugs
./virtualenv/bin/pip install --upgrade pip ./virtualenv/bin/pip install --upgrade pip
# work-around change in pip 1.5 # slightly old version of setuptools; newer fails w/ requests 0.14.0
./virtualenv/bin/pip install setuptools --upgrade ./virtualenv/bin/pip install setuptools==32.3.1
./virtualenv/bin/pip install -r requirements.txt ./virtualenv/bin/pip install -r requirements.txt