openstack
/
devstack
Code Issues Proposed changes

Don't install pinned setuptools with distro pip 

We are seeing failures when using an updated setuptools version
installed together with distro pip on Ubuntu 22.04. Install the version
from u-c only when we are also installing pip from upstream.

Change-Id: Ibb6e9424e5794ccbf9a937d2eecfa3bf60ed312e
This commit is contained in:
Dr. Jens Harbott 2022-06-07 10:12:59 +02:00
parent e661cae7e8
commit e6e7100e85
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/install_pip.sh
View File

@ -139,15 +139,18 @@ if is_fedora && [[ ${DISTRO} == f* || ${DISTRO} == rhel9 ]]; then
# recent enough anyway. This is included via rpms/general
: # Simply fall through
elif is_ubuntu; then
: # pip on Ubuntu 20.04 is new enough, too
# pip on Ubuntu 20.04 is new enough, too
# drop setuptools from u-c
sed -i -e '/setuptools/d' $REQUIREMENTS_DIR/upper-constraints.txt
else
install_get_pip
# Note setuptools is part of requirements.txt and we want to make sure
# we obey any versioning as described there.
pip_install_gr setuptools
fi
set -x
# Note setuptools is part of requirements.txt and we want to make sure
# we obey any versioning as described there.
pip_install_gr setuptools
get_versions