Skip to content

Commit

Permalink
install-deps: remove distribute requirement
Browse files Browse the repository at this point in the history
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>
(cherry picked from commit 64f14d4)
  • Loading branch information
Alfredo Deza authored and liewegas committed Apr 29, 2016
1 parent 0b6fc75 commit 7e9cb77
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand All @@ -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
Expand Down

0 comments on commit 7e9cb77

Please sign in to comment.