Merge ~mthaddon/postgresql-charm/+git/postgresql-charm:charmcraft into postgresql-charm:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: ac36ef387fb882e6de4962a1f1f3f2eb3adde14d
Merged at revision: a631e83241e0e1d1311de36b3ff5eb8c0a1b8612
Proposed branch: ~mthaddon/postgresql-charm/+git/postgresql-charm:charmcraft
Merge into: postgresql-charm:master
Diff against target: 47 lines (+23/-1)
3 files modified
charmcraft.yaml (+17/-0)
requirements.txt (+2/-1)
wheelhouse.txt (+4/-0)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+425160@code.launchpad.net

Commit message

Add a charmcraft.yaml and pin dependencies so this can be built for xenial, bionic, focal

Description of the change

Add a charmcraft.yaml and pin dependencies so this can be built for xenial, bionic, focal

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

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

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM. No Jammy support? It's the current LTS ;)

review: Approve (+1)
Revision history for this message
Tom Haddon (mthaddon) wrote :

No, not adding series support in a branch that is just about allowing us to build the charm again :)

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision a631e83241e0e1d1311de36b3ff5eb8c0a1b8612

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
2new file mode 100644
3index 0000000..6271283
4--- /dev/null
5+++ b/charmcraft.yaml
6@@ -0,0 +1,17 @@
7+type: "charm"
8+bases:
9+ - build-on:
10+ - name: "ubuntu"
11+ channel: "20.04"
12+ run-on:
13+ - name: "ubuntu"
14+ channel: "16.04"
15+ - name: "ubuntu"
16+ channel: "18.04"
17+ - name: "ubuntu"
18+ channel: "20.04"
19+parts:
20+ charm:
21+ source: .
22+ plugin: reactive
23+ build-snaps: [charm]
24diff --git a/requirements.txt b/requirements.txt
25index 8bbb991..a324a4e 100644
26--- a/requirements.txt
27+++ b/requirements.txt
28@@ -8,7 +8,8 @@ jinja2
29 juju-wait
30 python-swiftclient
31 charms.reactive
32-charmhelpers
33+# Needed to support xenial per https://discourse.charmhub.io/t/removing-py27-p35-from-charm-helpers-library/5335
34+charmhelpers<1.2.0
35 juju-deployer
36 pip
37 websocket-client
38diff --git a/wheelhouse.txt b/wheelhouse.txt
39new file mode 100644
40index 0000000..de27c62
41--- /dev/null
42+++ b/wheelhouse.txt
43@@ -0,0 +1,4 @@
44+# Needed to support xenial per https://discourse.charmhub.io/t/removing-py27-p35-from-charm-helpers-library/5335
45+charmhelpers<1.2.0
46+# Needed for xenial support - MarkupSafe 2.x only support python3.6 and greater
47+MarkupSafe<2.0.0

Subscribers

People subscribed via source and target branches

to all changes: