Merge ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:charmcraft-yaml into charm-k8s-discourse:master

[Tom Haddon]

Add a charmcraft.yaml and update path for tox

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

FAILED: Continuous integration, rev:bb013da16c36c83dfa103d472fe21eac40d84a94

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse/+merge/411514/+edit-commit-message

https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/34/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/149/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/538387/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/34//rebuild

review: Needs Fixing (continuous-integration)

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

Failed to merge change (unable to merge source repository due to conflicts), setting status to needs review.

diff --git a/Makefile b/Makefile
index d754dab..f4d845e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,7 @@ lint: blacken
 	@echo "Running flake8"
 	@tox -e lint
 
-# We actually use the build directory created by charmcraft,
-# but the .charm file makes a much more convenient sentinel.
-unittest: discourse-k8s.charm
+unittest:
 	@tox -e unit
 
 test: lint unittest
@@ -21,9 +19,6 @@ clean:
 	@echo "Cleaning files"
 	@git clean -fXd
 
-discourse-k8s.charm: src/*.py requirements.txt
-	charmcraft build
-
 build-image:
 	@echo "Building the image."
 	@docker build \
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..bf04cb1
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,8 @@
+type: charm
+bases:
+  - build-on:
+    - name: "ubuntu"
+      channel: "20.04"
+    run-on:
+    - name: "ubuntu"
+      channel: "20.04"
diff --git a/tox.ini b/tox.ini
index d48b030..3d6bf55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,6 @@ skip_missing_interpreters = True
 
 [testenv]
 basepython = python3
-setenv =
-  PYTHONPATH = {toxinidir}/build/lib:{toxinidir}/build/venv
 
 [testenv:unit]
 commands =
@@ -15,7 +13,7 @@ commands =
 deps = -r{toxinidir}/tests/unit/requirements.txt
        -r{toxinidir}/requirements.txt
 setenv =
-  PYTHONPATH={toxinidir}/src:{toxinidir}/build/lib:{toxinidir}/build/venv
+  PYTHONPATH = {toxinidir}/lib:{toxinidir}/src
   TZ=UTC
 
 [testenv:black]