Merge ~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost:ops-lib-pgsql into charm-k8s-mattermost:master

[Tom Haddon]

Switch to using ops-lib-pgsql rather than submodules for PostgreSQL relation

Switch to using ops-lib-pgsql rather than submodules for PostgreSQL relation

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

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

[Stuart Bishop (stub)]

This all looks correct.

review: Approve

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

Change successfully merged at revision 56ee71941b9eb6a3ea30b3dc6f9293ae88ff50c9

diff --git a/.gitmodules b/.gitmodules
 deleted file mode 100644
index 5b9992b..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "mod/interface-pgsql"]
-	path = mod/interface-pgsql
-	url = lp:~stub/interface-pgsql/+git/operator
diff --git a/lib/interface/pgsql b/lib/interface/pgsql
 deleted file mode 120000
index fac7ffe..0000000
--- a/lib/interface/pgsql
+++ /dev/null
@@ -1 +0,0 @@
-../../mod/interface-pgsql/pgsql
 \ No newline at end of file
diff --git a/mod/interface-pgsql b/mod/interface-pgsql
 deleted file mode 160000
index 6f38023..0000000
--- a/mod/interface-pgsql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6f38023049b15d5dcbe595880cfe3fdf51def83f
diff --git a/requirements.txt b/requirements.txt
index 2d81d3b..fd6adcd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 ops
+ops-lib-pgsql
diff --git a/src/charm.py b/src/charm.py
index 34f8922..2dc7a30 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -9,6 +9,7 @@ from ipaddress import ip_network
 from urllib.parse import urlparse
 from zlib import crc32
 
+import ops.lib
 from ops.charm import (
     CharmBase,
     CharmEvents,
@@ -26,12 +27,13 @@ from ops.model import (
     WaitingStatus,
 )
 
-from interface import pgsql
-
 from utils import extend_list_merging_dicts_matched_by_key
 
 import logging
 
+
+pgsql = ops.lib.use("pgsql", 1, "[e-mail]")
+
 logger = logging.getLogger()
 
 
diff --git a/tox.ini b/tox.ini
index 48bf1ab..066c5a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ passenv =
   JUJU_REPOSITORY
   PATH
 commands =
-	pytest -v --ignore mod --ignore {toxinidir}/tests/unit {posargs}
+	pytest -v --ignore {toxinidir}/tests/unit {posargs}
 deps = -r{toxinidir}/tests/functional/requirements.txt
        -r{toxinidir}/requirements.txt