launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+490028@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/lp-codeimport:migrate-lp-charm-to-focal into lp-codeimport:focal.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~tushar5526/lp-codeimport/+git/lp-codeimport/+merge/490028
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~tushar5526/lp-codeimport:migrate-lp-charm-to-focal into lp-codeimport:focal.

diff --git a/charm/lp-codeimport/charmcraft.yaml b/charm/lp-codeimport/charmcraft.yaml
index 86f193b..aae75cd 100644
--- a/charm/lp-codeimport/charmcraft.yaml
+++ b/charm/lp-codeimport/charmcraft.yaml
@@ -2,11 +2,11 @@ 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:
diff --git a/charm/lp-codeimport/layer.yaml b/charm/lp-codeimport/layer.yaml
index 75854a4..94b8725 100644
--- a/charm/lp-codeimport/layer.yaml
+++ b/charm/lp-codeimport/layer.yaml
@@ -4,23 +4,19 @@ options:
     apt:
         packages:
             - bzr
-            - cvs
             - git
             - libffi-dev
             - libssl-dev
-            - libsvn-dev
-            - python
-            - python-dev
-            - python-pkg-resources
-            - python-sqlite
-            - python-tdb
-            - subversion
+            - python3-dev
+            - python3-pkg-resources
             - virtualenv
+            - rabbitmq-server
+            - build-essential
     ols:
         service_name: lp-codeimport
         config_filename: service.conf
         user: importd
         tarball_payload: true
         symlink_switch_payload: true
-        python_bin: python2.7
+        python_bin: python3
 repo: https://git.launchpad.net/lp-codeimport
diff --git a/charm/lp-codeimport/metadata.yaml b/charm/lp-codeimport/metadata.yaml
index f688508..abf977a 100644
--- a/charm/lp-codeimport/metadata.yaml
+++ b/charm/lp-codeimport/metadata.yaml
@@ -7,7 +7,7 @@ tags:
   # https://juju.is/docs/charm-metadata#heading--charm-store-fields
   - network
 series:
-  - bionic
+  - focal
 subordinate: false
 requires:
   codeimport-storage: