mirror of
https://github.com/ceph/s3-tests.git
synced 2024-11-25 03:47:22 +00:00
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:
commit
65f711aaab
1 changed files with 14 additions and 5 deletions
19
bootstrap
19
bootstrap
|
@ -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
|
||||||
fi
|
elif [ -f /etc/fedora-release ]; then
|
||||||
if [ -f /etc/redhat-release ]; then
|
for package in python-pip python2-virtualenv python-devel libevent-devel; do
|
||||||
for package in python-pip python-virtualenv python-devel libevent-devel; do
|
if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
|
||||||
|
missing="${missing:+$missing }$package"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue