Remove accumulated python cruft

We nolonger need or want setuptools_git installed anywhere.
get-pip no longer needs ez_setup.py first. Also, github broke
redirection on Fedora, so change the URL.

Change-Id: I16d64695bf05e672fdc12236424b62e5cd5e5dc7
This commit is contained in:
Monty Taylor 2014-04-26 17:05:46 -07:00
parent 6972af3762
commit d0061640be
2 changed files with 0 additions and 25 deletions

View File

@ -17,11 +17,8 @@
# under the License.
# Install pip using get-pip
EZ_SETUP_URL=https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
PIP_GET_PIP_URL=https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py
curl -O $EZ_SETUP_URL || wget $EZ_SETUP_URL
python ez_setup.py
curl -O $PIP_GET_PIP_URL || wget $PIP_GET_PIP_URL
python get-pip.py

View File

@ -192,12 +192,6 @@ class jenkins::slave(
}
}
# Packages that need to be installed from pip
# Temporarily removed tox so we can pin it separately (see below)
$pip_packages = [
'setuptools-git',
]
if $python3 {
if ($::lsbdistcodename == 'precise') {
apt::ppa { 'ppa:zulcss/py3k':
@ -205,11 +199,6 @@ class jenkins::slave(
}
}
include pip::python3
package { $pip_packages:
ensure => latest, # we want the latest from these
provider => pip3,
require => Class[pip::python3],
}
# Temporarily handle tox separately so we can pin it
package { 'tox':
ensure => '1.6.1',
@ -217,11 +206,6 @@ class jenkins::slave(
require => Class['pip::python3'],
}
} else {
package { $pip_packages:
ensure => latest, # we want the latest from these
provider => pip,
require => Class[pip],
}
# Temporarily handle tox separately so we can pin it
package { 'tox':
ensure => '1.6.1',
@ -230,12 +214,6 @@ class jenkins::slave(
}
}
package { 'python-subunit':
ensure => absent,
provider => pip,
require => Class[pip],
}
package { 'git-review':
ensure => '1.17',
provider => pip,