Conversation
The library already creates a charm archive for local charms, but needed a few tweaks to accept an already-archived file.
SimonRichardson
approved these changes
Feb 4, 2021
| return None | ||
| try: | ||
| data = yaml.safe_load(md.open()) | ||
| if path.endswith('.charm'): |
Member
There was a problem hiding this comment.
👍 juju download also uses the .charm extension, so this is perfect.
Member
Member
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Mar 31, 2021
#481 Merge 2.9 into master This is brings in 2.9-rc3 schema as well, so that we're dealing with the latest changes. Conflicts: _client3.py - just re-ran the `make client` as the code is autogenerated. 5e23162 (upstream/master) Merge pull request #480 from SimonRichardson/release-2.8.6 3e23b74 (origin/master, origin/HEAD, master) Merge pull request #479 from SimonRichardson/schema-update-2.8.10 7f96863 Merge pull request #478 from SimonRichardson/scale-typo fd1438c Merge pull request #475 from achilleasa/provide-accessor-for-machine-hostname-field 1015f4d Expand wait_for_idle to support waiting for status (#473) 7829fd0 Merge pull request #471 from SimonRichardson/release-2.8.5 fd36c8f Merge pull request #470 from juju/johnsca/bundle-charm-files-and-wait 3d91d6b Merge pull request #469 from juju/johnsca/accept-charm-files 4e4e108 Merge pull request #465 from juju/johnsca/update-websockets/py39 d696937 Merge pull request #467 from gnuoy/issue/466
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The library already creates a charm archive for local charms, but needed a few tweaks to accept an already-archived file.