From 12ff9e7891c458fc2570fee78045157ca49645cf Mon Sep 17 00:00:00 2001 From: Trent Lloyd 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 (cherry picked from commit 8be49486c880b99c40253520dfcf110d5bf89c88) --- requirements.txt | 2 ++ setup.py | 3 +++ test-requirements.txt | 2 ++ 3 files changed, 7 insertions(+) diff --git a/requirements.txt b/requirements.txt index c4c46c09a..0f3c6dc94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,3 +34,5 @@ requests<2.26 # pin for py3.5 support # 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 00e19cdfb..ed68025c3 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 = [ diff --git a/test-requirements.txt b/test-requirements.txt index e93a02978..32293644e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -19,3 +19,5 @@ python-novaclient tenacity # Fix upper version to ensure compatibility with Juju 3.1 juju<3.2 +# https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94 +macaroonbakery!=1.3.3