Update pbr version to match global requirements

The version of pbr we were using was having trouble parsing a new version
identifier for python-qpid, We have the pbr version hardcoded in many
places so update it to match whats currently in global-requirements.

Fixes bug #1470871
Change-Id: Ia5aec472555ad1368684b224a55c29242ae40b58
This commit is contained in:
Derek Higgins 2015-07-02 16:50:06 +01:00
parent 41f12da094
commit 85c68ffc75
12 changed files with 12 additions and 12 deletions

View File

@ -21,7 +21,7 @@ $VENV/bin/pip install -U pip
# downloading from pypi using http_proxy and https_proxy
$VENV/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
$VENV/bin/pip install -U 'pbr>=0.6,<1.0'
$VENV/bin/pip install -U 'pbr>=0.11,<2.0'
$VENV/bin/pip install -U heat-cfntools
# symlink to /opt/aws/bin

View File

@ -65,7 +65,7 @@ else
pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'
pip install -U 'pbr>=0.11,<2.0'
if [ -e requirements.txt ]; then
pip install -r requirements.txt

View File

@ -17,7 +17,7 @@ else
# envvars
$OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
$OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0'
$OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
$OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config
fi

View File

@ -18,7 +18,7 @@ else
# envvars
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.6,<1.0'
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0'
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install \
--install-option="--install-scripts=/usr/local/bin" -U os-cloud-config
fi

View File

@ -17,7 +17,7 @@ else
# envvars
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.6,<1.0'
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0'
if [ -e /opt/stack/os-cloud-config/requirements.txt ]; then
reqs=/opt/stack/os-cloud-config/requirements.txt
elif [ -e /opt/stack/os-cloud-config/tools/pip-requires ]; then

View File

@ -15,7 +15,7 @@ else
# downloading from pypi using http_proxy and https_proxy
$OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
$OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0'
$OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
$OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config
fi

View File

@ -17,7 +17,7 @@ else
# envvars
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0'
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config
fi

View File

@ -21,7 +21,7 @@ else
/opt/stack/venvs/os-refresh-config/bin/pip install -U pip
/opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
/opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.5.21,<1.0'
/opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11,<2.0'
/opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
fi

View File

@ -38,7 +38,7 @@ function python_install() {
pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'
pip install -U 'pbr>=0.11,<2.0'
if [ -n "$reqs" ] ; then
# Install requirements off source repo if the install type

View File

@ -3,7 +3,7 @@
set -eux
# bug #1293812 : Avoid easy_install triggering on pbr.
$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.5.21,<1.0'
$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
# These are only needed if using keystone auth, so are not in requirements.txt
$SWIFT_VENV_DIR/bin/pip install keystonemiddleware

View File

@ -11,7 +11,7 @@ set -u
cd /opt/stack/tempest
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'
pip install -U 'pbr>=0.11,<2.0'
pip install -r test-requirements.txt

View File

@ -1 +1 @@
pbr>=0.5.21,<1.0
pbr>=0.11,<2.0