From 41d4c74ec9697d93c4b683a401517c4aba29bebd Mon Sep 17 00:00:00 2001 From: Peter Sabaini Date: Thu, 23 Jan 2025 12:34:26 +0100 Subject: [PATCH] Tests: pin boto3 For https://github.com/boto/boto3/issues/4398 Also lint updates Signed-off-by: Peter Sabaini Change-Id: Ieb248434b482f513060ca8b453e2068d51fde9cf --- hooks/utils.py | 4 ++-- test-requirements.txt | 3 +++ tox.ini | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hooks/utils.py b/hooks/utils.py index 8397ac8..b861162 100644 --- a/hooks/utils.py +++ b/hooks/utils.py @@ -256,10 +256,10 @@ def check_optional_config_and_relations(configs): "resolve." if (len(zonegroups) > 1 and config('zonegroup') not in zonegroups): - return('blocked', status_msg) + return ('blocked', status_msg) if len(zones) > 1 and config('zone') not in zones: - return('blocked', status_msg) + return ('blocked', status_msg) if not all(master_configured): return ('blocked', "Failure in Multisite migration, " diff --git a/test-requirements.txt b/test-requirements.txt index 59f3cbd..c2b3d81 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -30,3 +30,6 @@ git+https://opendev.org/openstack/tempest.git#egg=tempest croniter # needed for charm-rabbitmq-server unit tests psutil + +# https://github.com/boto/boto3/issues/4392 +boto3<1.36.0 diff --git a/tox.ini b/tox.ini index 8fb436a..c1b3ec4 100644 --- a/tox.ini +++ b/tox.ini @@ -68,7 +68,7 @@ deps = basepython = python3 deps = -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} - flake8==3.9.2 + flake8 git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} hooks unit_tests tests actions lib files charm-proof