TrueCloudLab/s3-tests
7
0
Fork 1
mirror of https://github.com/ceph/s3-tests.git synced 2024-11-21 23:29:47 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

Use non-broken version of setuptools, and fix bootstrap to be more portable.

Browse source 
Most recent version of setuptools breaks when asked to load requests 0.14.0.
symptom, complains about not being able to import filterfalse thus:
        from six.moves import map, filter, filterfalse
this comes from setuptools, and older versions of setuptools don't have
this problem.

Various versions of centos7 and fedora have interesting names for packages,
	centos7: python-pip is python2-pip
	fedora24: python-virtualenv is python2-virtualenv
This is somewhat masked by using sudo yum: if the actual package
,s installed, rpm knows that the capability is there and does nothing.
But, if the package isn't there, or you haven't chosen to set up
sudo to work that way, this does not work.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit ddc150439d)
This commit is contained in:
Marcus Watts 2017-01-26 03:26:55 -05:00
parent 5562bd6143
commit e85c6f3dda
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bootstrap
View file

@ -12,9 +12,18 @@ if [ -f /etc/debian_version ]; then
echo "$0: missing required DEB packages. Installing via sudo." 1>&2 echo "$0: missing required DEB packages. Installing via sudo." 1>&2
sudo apt-get -y install $missing sudo apt-get -y install $missing
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
@ -30,8 +39,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 (and more recent) # 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