Skip to content

Commit

Permalink
Install setuptools 'core' extra
Browse files Browse the repository at this point in the history
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]>
(cherry picked from commit 320c2bf)
  • Loading branch information
stephenfin committed Dec 5, 2024
1 parent ae4e1d6 commit 9530f18
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions inc/python
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ function setup_devstack_virtualenv {
# Using system site packages to enable nova to use libguestfs.
# This package is currently installed via the distro and not
# available on pypi.
python$PYTHON3_VERSION -m venv --system-site-packages $DEVSTACK_VENV
pip_install -U pip setuptools
$PYTHON -m venv --system-site-packages "${DEVSTACK_VENV}"
pip_install -U pip setuptools[core]
#NOTE(rpittau): workaround for simplejson removal in osc
# https://review.opendev.org/c/openstack/python-openstackclient/+/920001
pip_install -U simplejson
Expand Down
2 changes: 1 addition & 1 deletion lib/infra
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function install_infra {
local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
[ ! -d $PIP_VIRTUAL_ENV ] && ${VIRTUALENV_CMD} $PIP_VIRTUAL_ENV
# We don't care about testing git pbr in the requirements venv.
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools[core]
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR

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

0 comments on commit 9530f18

Please sign in to comment.