launchpad-reviewers team mailing list archive

[Colin Watson <mp+415363@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:charm-bionic-py3 into launchpad-buildd:master.

Commit message:
Upgrade charm to bionic and Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/415363

The charm is provided as a convenience for developers, so there are no production upgrades associated with this; but since launchpad-buildd will soon not support xenial, we should stop relying on it in the charm.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:charm-bionic-py3 into launchpad-buildd:master.

diff --git a/charm/Makefile b/charm/Makefile
index 029cffc..2c39dca 100644
--- a/charm/Makefile
+++ b/charm/Makefile
@@ -3,7 +3,7 @@ TOPDIR ?= $(CURDIR)/..
 BUILDDIR ?= $(CURDIR)/dist
 TMPDIR ?= $(CURDIR)/tmp
 
-CHARM_SERIES ?= xenial
+CHARM_SERIES ?= bionic
 CHARM_SRC ?= $(CURDIR)
 JUJU_REPOSITORY = $(BUILDDIR)
 CHARMDIR = $(BUILDDIR)/$(CHARM_SERIES)/$(NAME)
@@ -34,7 +34,7 @@ $(CHARM): $(CHARM_SRC) | $(BUILDDIR)
 	rm -rf $(CHARMDIR)
 	charm build -o $(BUILDDIR) -s $(CHARM_SERIES) -n $(NAME) $(EXTRA_CHARM_BUILD_ARGS)
 	touch $(CHARMDIR)/dummy-launchpad-buildd.deb
-	touch $(CHARMDIR)/dummy-python-lpbuildd.deb
+	touch $(CHARMDIR)/dummy-python3-lpbuildd.deb
 	touch $@
 
 clean:
@@ -48,7 +48,7 @@ $(RESOURCES):
 	mkdir -p $(RESOURCES)
 	cp -a $(TMPDIR)/launchpad-buildd_*.deb \
 	      $(RESOURCES)/launchpad-buildd.deb
-	cp -a $(TMPDIR)/python-lpbuildd_*.deb $(RESOURCES)/python-lpbuildd.deb
+	cp -a $(TMPDIR)/python3-lpbuildd_*.deb $(RESOURCES)/python3-lpbuildd.deb
 
 create-privileged-model:
 	juju add-model privileged localhost
@@ -60,7 +60,7 @@ deploy:
 deploy-with-packages:
 	juju deploy \
 		--resource=launchpad-buildd=$(RESOURCES)/launchpad-buildd.deb \
-		--resource=python-lpbuildd=$(RESOURCES)/python-lpbuildd.deb \
+		--resource=python3-lpbuildd=$(RESOURCES)/python3-lpbuildd.deb \
 		$(CHARMDIR)
 
 push:
@@ -69,7 +69,7 @@ push:
 push-with-packages:
 	charm push \
 		--resource=launchpad-buildd=$(CHARMDIR)/dummy-launchpad-buildd.deb \
-		--resource=python-lpbuildd=$(CHARMDIR)/dummy-python-lpbuildd.deb \
+		--resource=python3-lpbuildd=$(CHARMDIR)/dummy-python3-lpbuildd.deb \
 		$(CHARMDIR) $(CHARM_STORE_URL)
 
 .PHONY: build packages build-with-packages clean
diff --git a/charm/metadata.yaml b/charm/metadata.yaml
index feacad0..1817d1d 100644
--- a/charm/metadata.yaml
+++ b/charm/metadata.yaml
@@ -8,14 +8,14 @@ tags:
 maintainer: Colin Watson <cjwatson@xxxxxxxxxxxxx>
 subordinate: false
 series:
-    - xenial
+    - bionic
 resources:
     launchpad-buildd:
         type: file
         filename: launchpad-buildd.deb
         description: The main Launchpad builder package.
-    python-lpbuildd:
+    python3-lpbuildd:
         type: file
-        filename: python-lpbuildd.deb
+        filename: python3-lpbuildd.deb
         description: Python libraries supporting the Launchpad builder.
 min-juju-version: 2.0.0
diff --git a/charm/reactive/launchpad-buildd.py b/charm/reactive/launchpad-buildd.py
index 6ef8746..5a72e78 100644
--- a/charm/reactive/launchpad-buildd.py
+++ b/charm/reactive/launchpad-buildd.py
@@ -42,7 +42,7 @@ def install_packages():
     cache_dir = os.path.join(hookenv.charm_dir(), "cache")
     host.mkdir(cache_dir, perms=0o755)
     to_install = []
-    packages = ["launchpad-buildd", "python-lpbuildd"]
+    packages = ["launchpad-buildd", "python3-lpbuildd"]
     options = ["--option=Dpkg::Options::=--force-confold"]
     resource_paths = [hookenv.resource_get(package) for package in packages]
     if all(path and os.path.getsize(path) for path in resource_paths):
diff --git a/debian/changelog b/debian/changelog
index da2be62..85dc4e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+launchpad-buildd (209) UNRELEASED; urgency=medium
+
+  * Upgrade charm to bionic and Python 3.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Thu, 10 Feb 2022 09:27:28 +0000
+
 launchpad-buildd (208) bionic; urgency=medium
 
   [ Jürgen Gmach ]