From 2f15742cb96e1e3dffe8bf375b0c584bbf0c2827 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Fri, 12 Dec 2025 12:08:57 -0300 Subject: [PATCH] Fix build Summary: - Drop cliff - Add looseversion - Pin setuptools to allow keystoneauth1 get imported Change-Id: I6a3ef64e0f84e7936d894bed2127ea4c92f1c056 Signed-off-by: Felipe Reyes --- requirements.txt | 1 + test-requirements.txt | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 03e9f9d8..1bd73fb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ # requirements. They are intertwined. Also, Zaza itself should specify # all of its own requirements and if it doesn't, fix it there. # +setuptools<=68.1.2 # pinned to caracal version pbr==5.6.0 simplejson>=2.2.0 netifaces>=0.10.4 diff --git a/test-requirements.txt b/test-requirements.txt index e972406e..1837669f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,15 +8,11 @@ # all of its own requirements and if it doesn't, fix it there. # pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. - +looseversion # distutils.version.LooseVersion replacement for Python 3.12+ requests>=2.18.4 stestr>=2.2.0 -# Dependency of stestr. Workaround for -# https://github.com/mtreinish/stestr/issues/145 -cliff<3.0.0 - coverage>=4.5.2 pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) git+https://github.com/openstack-charmers/zaza.git#egg=zaza