Ubuntu Repository Cache Charm

Merge ~hloeung/ubuntu-repository-cache:master into ubuntu-repository-cache:master

  1. Git
  2. lp:~hloeung/ubuntu-repository-cache
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Loïc Gomez
Approved revision: 869854387b1484dc07f9dd62467fcd6a08c9bd16
Merged at revision: b33025eff8a9dba93d7f7d2e21011d4d81b58b4b
Proposed branch: ~hloeung/ubuntu-repository-cache:master
Merge into: ubuntu-repository-cache:master
Diff against target: 50 lines (+15/-19)
2 files modified
charmcraft.yaml (+8/-15)
wheelhouse.txt (+7/-4)
Reviewer Review Type Date Requested Status
Loïc Gomez +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+431868@code.launchpad.net

Commit message

New short-form for building charms using Launchpad; also work around Focal build issues with layer-basic (GH#210)

To post a comment you must log in.
Revision history for this message
Loïc Gomez (kotodama) :
review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision b33025eff8a9dba93d7f7d2e21011d4d81b58b4b

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charmcraft.yaml b/charmcraft.yaml
2index 07c4122..9a0f297 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -1,20 +1,13 @@
6 type: "charm"
7 bases:
8- - build-on:
9- # Can't build using Focal, although, probably best to default to build
10- # with Jammy from now on. See:
11- # https://github.com/canonical/charmcraft/issues/904
12- # - name: "ubuntu"
13- # channel: "20.04"
14- - name: "ubuntu"
15- channel: "22.04"
16- - name: "ubuntu"
17- channel: "22.10"
18- run-on:
19- - name: "ubuntu"
20- channel: "20.04"
21- - name: "ubuntu"
22- channel: "22.04"
23+ - name: "ubuntu"
24+ channel: "16.04"
25+ - name: "ubuntu"
26+ channel: "18.04"
27+ - name: "ubuntu"
28+ channel: "20.04"
29+ - name: "ubuntu"
30+ channel: "22.04"
31 parts:
32 charm:
33 source: .
34diff --git a/wheelhouse.txt b/wheelhouse.txt
35index 6c8cc55..bdd6853 100644
36--- a/wheelhouse.txt
37+++ b/wheelhouse.txt
38@@ -1,5 +1,8 @@
39 # Include python requirements here
40-# Drop to 1.6.0 which dramatically reduces build time (while still supporting Xenial)
41-backoff==1.6.0
42-# Xenial & py35 support - https://github.com/juju-solutions/layer-basic/pull/197
43-MarkupSafe<2.0.0
44+# Focal failures - https://github.com/juju-solutions/layer-basic/issues/210
45+Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py35, focal
46+Jinja2;python_version > '3.8'
47+setuptools<42;python_version <= '3.8'
48+setuptools;python_version > '3.8'
49+setuptools-scm<=1.17.0;python_version <= '3.8'
50+setuptools-scm;python_version > '3.8'

Subscribers

People subscribed via source and target branches