From b7d5d82dd9a75106faa86661e5e808b97ceb2ac2 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 faffe82cc..0b68b8b95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,3 +35,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 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 = [ diff --git a/test-requirements.txt b/test-requirements.txt index 120fe98dd..722c6a98e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,3 +18,5 @@ python-novaclient tenacity # pinned until 3.0 regressions are handled: https://github.com/openstack-charmers/zaza/issues/545 juju<3.0 +# https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94 +macaroonbakery!=1.3.3