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

[Tom Haddon]

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

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Haw Loeung (hloeung)]

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

review: Approve (+1)

[Tom Haddon (mthaddon)]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision a631e83241e0e1d1311de36b3ff5eb8c0a1b8612

diff --git a/charmcraft.yaml b/charmcraft.yaml
 new file mode 100644
index 0000000..6271283
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,17 @@
+type: "charm"
+bases:
+    - build-on:
+      - name: "ubuntu"
+        channel: "20.04"
+      run-on:
+      - name: "ubuntu"
+        channel: "16.04"
+      - name: "ubuntu"
+        channel: "18.04"
+      - name: "ubuntu"
+        channel: "20.04"
+parts:
+  charm:
+    source: .
+    plugin: reactive
+    build-snaps: [charm]
diff --git a/requirements.txt b/requirements.txt
index 8bbb991..a324a4e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,8 @@ jinja2
 juju-wait
 python-swiftclient
 charms.reactive
-charmhelpers
+# Needed to support xenial per https://discourse.charmhub.io/t/removing-py27-p35-from-charm-helpers-library/5335
+charmhelpers<1.2.0
 juju-deployer
 pip
 websocket-client
diff --git a/wheelhouse.txt b/wheelhouse.txt
 new file mode 100644
index 0000000..de27c62
--- /dev/null
+++ b/wheelhouse.txt
@@ -0,0 +1,4 @@
+# Needed to support xenial per https://discourse.charmhub.io/t/removing-py27-p35-from-charm-helpers-library/5335
+charmhelpers<1.2.0
+# Needed for xenial support - MarkupSafe 2.x only support python3.6 and greater
+MarkupSafe<2.0.0