From d6692ed70aebc5387997660e9e2b025e96eff96f Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 20 Apr 2016 16:23:55 -0400 Subject: [PATCH] install-deps: remove distribute requirement Because it was meant for Ubuntu 12.04 and it is installing directly from PyPI on newer releases that aren't being built for 12.04 Signed-off-by: Alfredo Deza (cherry picked from commit 64f14d43a829f998b9a2ad5f3d87095560914e2a) --- install-deps.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 8249ea3459729..21e71ee77977a 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -66,7 +66,7 @@ CentOS|Fedora|RedHatEnterpriseServer) $SUDO yum install subscription-manager $SUDO subscription-manager repos --enable=rhel-$MAJOR_VERSION-server-optional-rpms fi - $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/x86_64/ + $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/x86_64/ $SUDO yum install --nogpgcheck -y epel-release $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org* @@ -92,8 +92,6 @@ function populate_wheelhouse() { local install=$1 shift - # Ubuntu-12.04 and Python 2.7.3 require this line - pip --timeout 300 $install 'distribute >= 0.7.3' || return 1 # although pip comes with virtualenv, having a recent version # of pip matters when it comes to using wheel packages pip --timeout 300 $install 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' || return 1