Skip to content

Commit e6e7100

Browse files
committed
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
1 parent e661cae commit e6e7100

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

tools/install_pip.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,18 @@ if is_fedora && [[ ${DISTRO} == f* || ${DISTRO} == rhel9 ]]; then
139139
# recent enough anyway. This is included via rpms/general
140140
: # Simply fall through
141141
elif is_ubuntu; then
142-
: # pip on Ubuntu 20.04 is new enough, too
142+
# pip on Ubuntu 20.04 is new enough, too
143+
# drop setuptools from u-c
144+
sed -i -e '/setuptools/d' $REQUIREMENTS_DIR/upper-constraints.txt
143145
else
144146
install_get_pip
147+
148+
# Note setuptools is part of requirements.txt and we want to make sure
149+
# we obey any versioning as described there.
150+
pip_install_gr setuptools
145151
fi
146152

147153
set -x
148154

149-
# Note setuptools is part of requirements.txt and we want to make sure
150-
# we obey any versioning as described there.
151-
pip_install_gr setuptools
152155

153156
get_versions

0 commit comments

Comments
 (0)