From 78242ed8831ca3d140ccdb44d4213575d2530d41 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Sat, 22 Apr 2023 18:22:55 +0100
Subject: [PATCH] Couple of pins to ensure stability on antelope

These are a couple of pins on aodhclient for stability on antelope. This
would be better as upper constraints, but that still a WIP item.
---
 requirements.txt | 4 ++--
 setup.py         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a8fb306b1..2efa9c555 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # BUG: https://github.com/openstack-charmers/zaza-openstack-tests/issues/530
 lxml<4.6.3; python_version < '3.8'
 lxml; python_version >= '3.8'
-pyparsing<3.0.0; python_version <= '3.5'  # pin for aodhclient which is held for py35
+pyparsing<3.1.0
 aiounittest
 async_generator
 # pyopenssl depends on a newer version of cryptography since 22.1.0
@@ -31,7 +31,7 @@ six>=1.9.0
 dnspython>=1.12.0
 psutil>=1.1.1,<2.0.0
 python-openstackclient>=3.14.0
-aodhclient
+aodhclient<3.3.0
 gnocchiclient>=7.0.5,<8.0.0
 pika>=1.1.0,<2.0.0
 python-barbicanclient
diff --git a/setup.py b/setup.py
index 75742f170..e944bacc4 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,8 @@
     'PyYAML',
     'tenacity',
     'oslo.config<6.12.0',
-    'aodhclient',
+    'pyparsing<3.1.0',
+    'aodhclient<3.3.0',
     'gnocchiclient>=7.0.5,<8.0.0',
     'pika>=1.1.0,<2.0.0',
     'python-barbicanclient>=4.0.1,<5.0.0',