From c69ead8b45d28befc693a5d0583868cef501ff25 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 29 Mar 2021 13:13:16 +0100 Subject: [PATCH] Drop pbr version ceiling and add py39 testing - Ceiling of pbr version can create installation conflicts with pip. - Fixes tox default env list to be python version agnostic - Updated template to use newer jobs (include testing with newer python) Bug: #1921679 Change-Id: Ifd0d2f810799992faa1db41b80bf93bc97d5d19d --- .../install.d/os-apply-config-source-install/10-os-apply-config | 2 +- .../os-collect-config-source-install/10-os-collect-config | 2 +- .../os-net-config-source-install/50-os-net-config-source | 2 +- .../os-refresh-config-source-install/10-os-refresh-config | 2 +- elements/os-svc-install/bin/os-svc-install | 2 +- setup.cfg | 2 ++ tox.ini | 2 +- zuul.d/layout.yaml | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config index cce3052ee..3ce92db84 100755 --- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config +++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config @@ -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 diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config index 53a71faca..c849408a5 100755 --- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config +++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config @@ -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 diff --git a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source index b071e639f..d438df713 100755 --- a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source +++ b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source @@ -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 diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config index 26139155d..52d7f88b8 100755 --- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config +++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config @@ -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 diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install index bb90012f2..6f30f2a9e 100755 --- a/elements/os-svc-install/bin/os-svc-install +++ b/elements/os-svc-install/bin/os-svc-install @@ -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 diff --git a/setup.cfg b/setup.cfg index 2cf41573d..f3c73a314 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,8 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 [files] data_files = diff --git a/tox.ini b/tox.ini index 173e6e0f1..cd21ae2ba 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 2.0 skipsdist = True -envlist = pep8,py37 +envlist = pep8,py [testenv] basepython = python3 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 655f7b931..330525218 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -1,7 +1,7 @@ - project: templates: - tripleo-buildimage-jobs - - openstack-python3-victoria-jobs + - openstack-python3-wallaby-jobs - release-notes-jobs-python3 post: jobs: