]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps: remove distribute requirement 8668/head 8680/head
authorAlfredo Deza <adeza@redhat.com>
Wed, 20 Apr 2016 20:23:55 +0000 (16:23 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 20 Apr 2016 20:23:55 +0000 (16:23 -0400)
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 <adeza@redhat.com>
install-deps.sh

index 8249ea3459729df6bb55ca540e079844900ae695..21e71ee77977a6bdd7336b2f4f7ce695696d6964 100755 (executable)
@@ -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