From 10c4009f674f0479e98dc39f0a0e9f4c119a7a65 Mon Sep 17 00:00:00 2001
From: Trent Lloyd <trent.lloyd@canonical.com>
Date: Fri, 8 Dec 2023 20:34:26 +0800
Subject: [PATCH] Avoid broken macaroonbakery release

macaroonbakery 1.3.3 has a broken protobuf dependency, add a requirement
to avoid that specific release:
https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94

Conflicts:
    test-requirements.txt

(cherry picked from commit 8be49486c880b99c40253520dfcf110d5bf89c88)
---
 requirements.txt | 2 ++
 setup.py         | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index cfa9f59c1..1abf6292c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -41,3 +41,5 @@ python-libmaas
 # Documentation requirements
 sphinx
 sphinxcontrib-asyncio
+# https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
+macaroonbakery!=1.3.3
diff --git a/setup.py b/setup.py
index 87445e411..2d41ffcf9 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,9 @@
     'PyYAML',
     'tenacity',
     'python-libmaas',
+
+    # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
+    'macaroonbakery != 1.3.3',
 ]
 
 tests_require = [