From 4146651bac960418596526b5391964bbcf8a3d74 Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Thu, 5 Oct 2023 12:09:23 -0600
Subject: [PATCH] Use local fork for macaroonbakery that supports protobuf >=
 4.21.1

Fixes #914 by using a fork of macaroonbakery that's introduced in
https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/90
---
 setup.py | 3 ++-
 tox.ini  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index afe2513b..ede94814 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,8 @@
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     package_data={'juju': ['py.typed']},
     install_requires=[
-        'macaroonbakery>=1.1,<2.0',
+        # see https://github.com/juju/python-libjuju/issues/914 for macaroon dependency
+        'macaroonbakery@git+https://github.com/cderici/py-macaroon-bakery@relax-protobuf-version#egg=macaroonbakery',
         'pyRFC3339>=1.0,<2.0',
         'pyyaml>=5.1.2',
         'websockets>=8.1,<9.0 ; python_version=="3.8"',
diff --git a/tox.ini b/tox.ini
index 5827260d..cda60eb5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ passenv =
     TEST_AGENTS
     LXD_DIR
 deps =
-    macaroonbakery
+    git+https://github.com/cderici/py-macaroon-bakery@relax-protobuf-version#egg=macaroonbakery
     toposort
     typing-inspect
     paramiko