From 488cd796af8b452d5e8088fa2b434752eb01daa9 Mon Sep 17 00:00:00 2001 From: Jorge Merlino Date: Thu, 24 Oct 2024 10:20:50 -0300 Subject: [PATCH] Change tempest dependency to a release Tempest is pulled from git in this project. Currently git tempest requires oslo.utils>= 7.0.0 but that does not work here as this project has oslo.utils pinned to 6.2.1. The dependency has been changed to a release and pip-compile has been run to update the requirement files. Change-Id: Iee8f8153cf66776620146d13bbc5cd2a0a0138bd --- merged-requirements-py310.txt | 7 ++++++- merged-requirements-py38.txt | 7 ++++++- test-requirements-py38.txt | 7 ++++++- test-requirements.in | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/merged-requirements-py310.txt b/merged-requirements-py310.txt index ea2a28a1..b5d78fa3 100644 --- a/merged-requirements-py310.txt +++ b/merged-requirements-py310.txt @@ -230,6 +230,7 @@ macaroonbakery==1.3.1 # juju # python-libmaas # theblues + # zaza markupsafe==2.1.3 # via jinja2 msgpack==1.0.7 @@ -413,6 +414,7 @@ pbr==5.6.0 # stestr # stevedore # tempest + # testscenarios # testtools pika==1.3.2 # via zaza-openstack @@ -661,7 +663,7 @@ stevedore==5.1.0 # python-keystoneclient # python-magnumclient # tempest -tempest @ git+https://opendev.org/openstack/tempest.git +tempest==41.0.0 # via -r test-requirements.in tenacity==8.2.3 # via @@ -669,12 +671,15 @@ tenacity==8.2.3 # zaza-openstack terminaltables==3.1.10 # via python-libmaas +testscenarios==0.5.0 + # via tempest testtools==2.6.0 # via # fixtures # python-subunit # stestr # tempest + # testscenarios theblues==0.5.2 # via juju tomlkit==0.12.1 diff --git a/merged-requirements-py38.txt b/merged-requirements-py38.txt index 19585dc7..a9f9b117 100644 --- a/merged-requirements-py38.txt +++ b/merged-requirements-py38.txt @@ -234,6 +234,7 @@ macaroonbakery==1.3.1 # juju # python-libmaas # theblues + # zaza markupsafe==2.1.3 # via jinja2 msgpack==1.0.7 @@ -417,6 +418,7 @@ pbr==5.6.0 # stestr # stevedore # tempest + # testscenarios # testtools pika==1.3.2 # via zaza-openstack @@ -668,7 +670,7 @@ stevedore==5.1.0 # python-keystoneclient # python-magnumclient # tempest -tempest @ git+https://opendev.org/openstack/tempest.git +tempest==41.0.0 # via -r test-requirements.in tenacity==8.2.3 # via @@ -676,12 +678,15 @@ tenacity==8.2.3 # zaza-openstack terminaltables==3.1.10 # via python-libmaas +testscenarios==0.5.0 + # via tempest testtools==2.6.0 # via # fixtures # python-subunit # stestr # tempest + # testscenarios theblues==0.5.2 # via juju tomlkit==0.12.1 diff --git a/test-requirements-py38.txt b/test-requirements-py38.txt index 4fbe8a8f..31f3a378 100644 --- a/test-requirements-py38.txt +++ b/test-requirements-py38.txt @@ -231,6 +231,7 @@ macaroonbakery==1.3.1 # juju # python-libmaas # theblues + # zaza markupsafe==2.1.3 # via jinja2 msgpack==1.0.7 @@ -411,6 +412,7 @@ pbr==5.11.1 # stestr # stevedore # tempest + # testscenarios # testtools pika==1.3.2 # via zaza-openstack @@ -657,7 +659,7 @@ stevedore==5.1.0 # python-keystoneclient # python-magnumclient # tempest -tempest @ git+https://opendev.org/openstack/tempest.git +tempest==41.0.0 # via -r test-requirements.in tenacity==8.2.3 # via @@ -665,11 +667,14 @@ tenacity==8.2.3 # zaza-openstack terminaltables==3.1.10 # via python-libmaas +testscenarios==0.5.0 + # via tempest testtools==2.6.0 # via # python-subunit # stestr # tempest + # testscenarios theblues==0.5.2 # via juju tomlkit==0.12.1 diff --git a/test-requirements.in b/test-requirements.in index c9832c1d..ff9d2b34 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -23,7 +23,7 @@ git+https://github.com/openstack-charmers/zaza.git@stable/bobcat#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/bobcat#egg=zaza.openstack # Needed for charm-glance: -git+https://opendev.org/openstack/tempest.git#egg=tempest +tempest croniter # needed for charm-rabbitmq-server unit tests psutil