Browse Source

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)
(cherry picked from commit 55b2437394)
changes/04/788004/3
Sorin Sbarnea 2 months ago
committed by Alex Schultz
parent
commit
2b5e3aaefd
8 changed files with 8 additions and 8 deletions
  1. +1
    -1
      elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
  2. +1
    -1
      elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
  3. +1
    -1
      elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source
  4. +1
    -1
      elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
  5. +1
    -1
      elements/os-svc-install/bin/os-svc-install
  6. +1
    -1
      requirements.txt
  7. +1
    -1
      test-requirements.txt
  8. +1
    -1
      tests/test_no_dup_filenames.py

+ 1
- 1
elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config 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


+ 1
- 1
elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config 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


+ 1
- 1
elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source 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


+ 1
- 1
elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config 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


+ 1
- 1
elements/os-svc-install/bin/os-svc-install 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


+ 1
- 1
requirements.txt View File

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

+ 1
- 1
test-requirements.txt View File

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


+ 1
- 1
tests/test_no_dup_filenames.py View File

@ -37,5 +37,5 @@ class TestNoDupFilenames(testtools.TestCase):
short_path = target[len(element_dir) + 1:]
if not os.path.isdir(target):
err_msg = 'Duplicate file name found %s' % short_path
self.assertFalse(short_path in filenames, err_msg)
self.assertNotIn(short_path, filenames, err_msg)
filenames.append(short_path)

Loading…
Cancel
Save