charm-local-users

Merge ~afreiberger/charm-local-users:bug/1964807 into charm-local-users:main

  1. Git
  2. lp:~afreiberger/charm-local-users
  3. bug/1964807
  4. Merge into main
Proposed by Drew Freiberger
Status: Merged
Approved by: Xav Paice
Approved revision: 2504f1fd0dca8bb7251f0d921ac632430bafba60
Merged at revision: 1d9b382a4f5ee6aed3226023f6a2fa9d06026eb2
Proposed branch: ~afreiberger/charm-local-users:bug/1964807
Merge into: charm-local-users:main
Diff against target: 11 lines (+3/-0)
1 file modified
charmcraft.yaml (+3/-0)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Garrett Neugent (community) Approve
BootStack Reviewers Pending
Review via email: mp+416827@code.launchpad.net

Commit message

add workaround for charmcraft/jinja/markup compatibility

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Garrett Neugent (thogarre) wrote :

LGTM

review: Approve
Revision history for this message
Xav Paice (xavpaice) wrote :

lgtm

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 1d9b382a4f5ee6aed3226023f6a2fa9d06026eb2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charmcraft.yaml b/charmcraft.yaml
2index 357bf49..fd5e934 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -4,3 +4,6 @@ bases:
6 channel: "20.04"
7 - name: "ubuntu"
8 channel: "18.04"
9+parts:
10+ charm:
11+ charm-python-packages: [setuptools < 58]

Subscribers

People subscribed via source and target branches

to all changes: