Skip to content

Commit

Permalink
Avoid broken macaroonbakery release
Browse files Browse the repository at this point in the history
macaroonbakery 1.3.3 has a broken protobuf dependency, add a requirement
to avoid that specific release:
go-macaroon-bakery/py-macaroon-bakery#94

Conflicts:
    test-requirements.txt

Also drop py36 and py37 from github workflow as they ares no longer
available on ubuntu-latest and not needed for wallaby which is focal
based.

(cherry picked from commit 8be4948)
  • Loading branch information
lathiat authored and Corey Bryant committed Dec 8, 2023
1 parent eb4769c commit 81237a5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/tox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.8, 3.9]

steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 81237a5

Please sign in to comment.