Merge ~pelpsi/turnip/+git/turnipcake:turnipcake-charm-upgrade-to-focal into ~canonical-launchpad-branches/turnip/+git/turnipcake:master

[Simone Pelosi]

Upgraded Turnipcake charm to focal

Updated layers to the latest versions
Changed series to focal
Removed unnecessary code

[Simone Pelosi (pelpsi)]

Blocked by : https://code.launchpad.net/~pelpsi/ols-charm-deps/+git/wheels/+merge/447788

Once the above is merged, charm-wheels must be updated accordingly.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/charm/dependencies.txt b/charm/dependencies.txt
index ae7d8f8..df3987d 100644
--- a/charm/dependencies.txt
+++ b/charm/dependencies.txt
@@ -8,4 +8,4 @@ layer/basic			git+https://github.com/juju-solutions/layer-basic;revno=baf58223
 layer/options			git+https://github.com/juju-solutions/layer-options;revno=fcdcea4e
 layer/status			git+https://github.com/juju-solutions/layer-status;revno=02658f0f
 
-charm-wheels			git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
+charm-wheels			git+https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
diff --git a/charm/turnipcake/charmcraft.yaml b/charm/turnipcake/charmcraft.yaml
index 7d5e014..5f7f595 100644
--- a/charm/turnipcake/charmcraft.yaml
+++ b/charm/turnipcake/charmcraft.yaml
@@ -2,16 +2,16 @@ type: charm
 bases:
   - build-on:
     - name: ubuntu
-      channel: "18.04"
+      channel: "20.04"
       architectures: [amd64]
     run-on:
     - name: ubuntu
-      channel: "18.04"
+      channel: "20.04"
       architectures: [amd64]
 parts:
   charm-wheels:
-    source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
-    source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
+    source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
+    source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   interface-http:
     source: https://github.com/juju-solutions/interface-http
-    source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
+    source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -33,7 +33,7 @@ parts:
       - "-layers"
   interface-nrpe-external-master:
     source: https://github.com/canonical-ols/nrpe-external-master-interface
-    source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
+    source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -45,7 +45,7 @@ parts:
       - "-layers"
   layer-apt:
     source: https://git.launchpad.net/layer-apt
-    source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
+    source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -57,7 +57,7 @@ parts:
       - "-layers"
   layer-basic:
     source: https://github.com/juju-solutions/layer-basic
-    source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
+    source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -81,7 +81,7 @@ parts:
       - "-layers"
   layer-status:
     source: https://github.com/juju-solutions/layer-status
-    source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
+    source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -103,6 +103,7 @@ parts:
     source: .
     plugin: reactive
     build-snaps: [charm]
+    build-packages: [python3-dev]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
diff --git a/charm/turnipcake/layer.yaml b/charm/turnipcake/layer.yaml
index 830413b..5f6907b 100644
--- a/charm/turnipcake/layer.yaml
+++ b/charm/turnipcake/layer.yaml
@@ -8,8 +8,3 @@ repo: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/turnip
 options:
     basic:
         use_venv: true
-    apt:
-        packages:
-            - python-virtualenv
-            - python-dev
-            - make
diff --git a/charm/turnipcake/metadata.yaml b/charm/turnipcake/metadata.yaml
index e48a804..08b5231 100644
--- a/charm/turnipcake/metadata.yaml
+++ b/charm/turnipcake/metadata.yaml
@@ -12,6 +12,7 @@ tags:
   # https://docs.jujucharms.com/devel/en/authors-charm-metadata#charm-store-fields
   - network
 series:
+  - focal
   - bionic
   - xenial
 subordinate: false
diff --git a/charm/turnipcake/reactive/turnipcake.py b/charm/turnipcake/reactive/turnipcake.py
index 97b871f..58c44a4 100644
--- a/charm/turnipcake/reactive/turnipcake.py
+++ b/charm/turnipcake/reactive/turnipcake.py
@@ -35,9 +35,6 @@ def install():
     set_flag('turnipcake.created_user')
 
 
-@when('apt.installed.python-virtualenv')
-@when('apt.installed.python-dev')
-@when('apt.installed.make')
 @when('turnipcake.created_user')
 @when_not('turnipcake.installed')
 def install_turnipcake():