Skip to content

Commit 320c2bf

Browse files
committed
Install setuptools 'core' extra
Under as-yet-unidentified conditions, we can end up with a version of packaging that is too old for the version of latest version of setuptools. This is a known issue and expected behavior and per [1] $subject is the preferred resolution. [1] pypa/setuptools#4483 (comment) Change-Id: I9232f3fae1598297e83c4ea37339896f7dcbd44f Signed-off-by: Stephen Finucane <[email protected]>
1 parent 97ea68e commit 320c2bf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: inc/python

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ function setup_devstack_virtualenv {
4040
# Using system site packages to enable nova to use libguestfs.
4141
# This package is currently installed via the distro and not
4242
# available on pypi.
43-
python$PYTHON3_VERSION -m venv --system-site-packages $DEVSTACK_VENV
44-
pip_install -U pip setuptools
43+
$PYTHON -m venv --system-site-packages "${DEVSTACK_VENV}"
44+
pip_install -U pip setuptools[core]
4545
#NOTE(rpittau): workaround for simplejson removal in osc
4646
# https://review.opendev.org/c/openstack/python-openstackclient/+/920001
4747
pip_install -U simplejson

Diff for: lib/infra

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function install_infra {
3131
local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
3232
[ ! -d $PIP_VIRTUAL_ENV ] && ${VIRTUALENV_CMD} $PIP_VIRTUAL_ENV
3333
# We don't care about testing git pbr in the requirements venv.
34-
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools
34+
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools[core]
3535
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
3636

3737
# Unset the PIP_VIRTUAL_ENV so that PBR does not end up trapped

0 commit comments

Comments
 (0)