Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change dependency for macaroonbakery to support protobuf >= 4.21.1 #956

Closed
wants to merge 1 commit into from
Closed

Change dependency for macaroonbakery to support protobuf >= 4.21.1 #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to fork that into the juju namespace.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SimonRichardson I'd steer away from that because in my mind this is mostly a temporary solution, mostly because 1) I don't want us to maintain that, 2) macaroonbakery library hasn't been touched since 2020, so we gotta find another more up-to-date library for that, wdyt?

'pyRFC3339>=1.0,<2.0',
'pyyaml>=5.1.2',
'websockets>=8.1,<9.0 ; python_version=="3.8"',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading