openstack/devstack
Code Issues Proposed changes

Merge "Fix six package on opensuse for pip 10"

Browse Source
This commit is contained in:
Zuul 2019-09-30 17:15:28 +00:00 committed by Gerrit Code Review
commit 729f8b8ca6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@ -796,9 +796,6 @@ if [[ "$OFFLINE" != "True" ]]; then
PYPI_ALTERNATIVE_URL=${PYPI_ALTERNATIVE_URL:-""} $TOP_DIR/tools/install_pip.sh PYPI_ALTERNATIVE_URL=${PYPI_ALTERNATIVE_URL:-""} $TOP_DIR/tools/install_pip.sh
fi fi
# Install subunit for the subunit output stream
pip_install -U os-testr
TRACK_DEPENDS=${TRACK_DEPENDS:-False} TRACK_DEPENDS=${TRACK_DEPENDS:-False}
# Install Python packages into a virtualenv so that we can track them # Install Python packages into a virtualenv so that we can track them
@ -816,6 +813,9 @@ fi
source $TOP_DIR/tools/fixup_stuff.sh source $TOP_DIR/tools/fixup_stuff.sh
fixup_all fixup_all
# Install subunit for the subunit output stream
pip_install -U os-testr
if [[ "$USE_SYSTEMD" == "True" ]]; then if [[ "$USE_SYSTEMD" == "True" ]]; then
pip_install_gr systemd-python pip_install_gr systemd-python
# the default rate limit of 1000 messages / 30 seconds is not # the default rate limit of 1000 messages / 30 seconds is not

1
tools/fixup_stuff.sh
View File

@ -256,6 +256,7 @@ function fixup_suse {
# overwriting works. So this hacks around those packages that # overwriting works. So this hacks around those packages that
# have been dragged in by some other system dependency # have been dragged in by some other system dependency
sudo rm -rf /usr/lib/python3.6/site-packages/ply-*.egg-info sudo rm -rf /usr/lib/python3.6/site-packages/ply-*.egg-info
sudo rm -rf /usr/lib/python3.6/site-packages/six-*.egg-info
} }
# The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has # The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has