Drop pbr version ceiling

- Ceiling of pbr version can create installation conflicts with pip.
- Fixes tox default env list to be python version agnostic
- Includes hacking version bump to fix dependencies

NOTE: Partial backport of the master fix. This patch excludes the py39
job updates.

Bug: #1921679
Change-Id: Ifd0d2f810799992faa1db41b80bf93bc97d5d19d
(cherry picked from commit c69ead8b45)
This commit is contained in:
Sorin Sbarnea
2021-03-29 13:13:16 +01:00
committed by Alex Schultz
parent c1a598f643
commit 55b2437394
7 changed files with 7 additions and 7 deletions

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.11,<2.0'
$OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
$OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config
fi

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.11,<2.0'
$OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
$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.11,<2.0'
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
$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.11,<2.0'
/opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11'
/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.11,<2.0'
pip install -U 'pbr>=0.11'
if [ -n "$reqs" ] ; then
# Install requirements off source repo if the install type

View File

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

View File

@@ -1,4 +1,4 @@
hacking>=1.1.0,<1.2.0 # Apache-2.0
hacking>=2.0.0 # Apache-2.0
openstackdocstheme>=2.2.1 # Apache-2.0
oslotest