Skip to content

Commit 1587ba1

Browse files
committed
Remove fixup_virtualenv
This first came in with Id749c37ab7fefa96b35f11816b56b9def5ef4b08. It talks about ancient versions of pip; can't see we need it any more. Change-Id: I9d4831955070990a81a809d988612d9d5b1aa672
1 parent be26306 commit 1587ba1

1 file changed

Lines changed: 0 additions & 30 deletions

File tree

tools/fixup_stuff.sh

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -202,39 +202,9 @@ function fixup_suse {
202202
sudo rm -rf /usr/lib/python3.6/site-packages/six-*.egg-info
203203
}
204204

205-
# The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has
206-
# connection issues under proxy so re-install the latest version using
207-
# pip. To avoid having pip's virtualenv overwritten by the distro's
208-
# package (e.g. due to installing a distro package with a dependency
209-
# on python-virtualenv), first install the distro python-virtualenv
210-
# to satisfy any dependencies then use pip to overwrite it.
211-
212-
# ... but, for infra builds, the pip-and-virtualenv [1] element has
213-
# already done this to ensure the latest pip, virtualenv and
214-
# setuptools on the base image for all platforms. It has also added
215-
# the packages to the yum/dnf ignore list to prevent them being
216-
# overwritten with old versions. F26 and dnf 2.0 has changed
217-
# behaviour that means re-installing python-virtualenv fails [2].
218-
# Thus we do a quick check if we're in the infra environment by
219-
# looking for the mirror config script before doing this, and just
220-
# skip it if so.
221-
222-
# [1] https://opendev.org/openstack/diskimage-builder/src/branch/master/ \
223-
# diskimage_builder/elements/pip-and-virtualenv/ \
224-
# install.d/pip-and-virtualenv-source-install/04-install-pip
225-
# [2] https://bugzilla.redhat.com/show_bug.cgi?id=1477823
226-
227-
function fixup_virtualenv {
228-
if [[ ! -f /etc/ci/mirror_info.sh ]]; then
229-
install_package python-virtualenv
230-
pip_install -U --force-reinstall virtualenv
231-
fi
232-
}
233-
234205
function fixup_all {
235206
fixup_keystone
236207
fixup_ubuntu
237208
fixup_fedora
238209
fixup_suse
239-
fixup_virtualenv
240210
}

0 commit comments

Comments
 (0)