Use local fork for macaroonbakery that supports protobuf >= 4.21.1

Fixes juju#914 by using a fork of macaroonbakery that's introduced in go-macaroon-bakery/py-macaroon-bakery#90
cderici · Oct 5, 2023 · 4146651 · 4146651
1 parent be013d7
commit 4146651
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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