Ubuntu Repository Cache Charm

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

  1. Git
  2. lp:~hloeung/ubuntu-repository-cache
  3. fixes
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 00d098ee51e2f03da4616d26a4f2a884b82ee853
Merged at revision: 1b5c2db1dd69d4412d67390511b2dd732f6daba0
Proposed branch: ~hloeung/ubuntu-repository-cache:fixes
Merge into: ubuntu-repository-cache:master
Diff against target: 18 lines (+5/-0)
1 file modified
wheelhouse.txt (+5/-0)
Reviewer Review Type Date Requested Status
Loïc Gomez +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+432108@code.launchpad.net

Commit message

wheelhouse from autocert to resolve issues with Focal

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 :

Merge proposal is approved, but source revision has changed, setting status to needs review.

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

Change successfully merged at revision 1b5c2db1dd69d4412d67390511b2dd732f6daba0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/wheelhouse.txt b/wheelhouse.txt
2index fea4a1c..d738cc9 100644
3--- a/wheelhouse.txt
4+++ b/wheelhouse.txt
5@@ -2,8 +2,13 @@
6 # 1.7.0 introduces the poetry and later poetry-core requirement.
7 backoff<1.7.0
8 # Focal failures - https://github.com/juju-solutions/layer-basic/issues/210
9+Jinja2==2.10;python_version >= '3.0' and python_version <= '3.4' # py3 trusty
10+Jinja2==2.11;python_version == '2.7' or python_version == '3.5' # py27, py35
11+# Focal failures - https://github.com/juju-solutions/layer-basic/issues/210
12 Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py38, focal
13 Jinja2;python_version > '3.8'
14+# Needed to support Focal - https://github.com/juju-solutions/layer-basic/issues/210 & https://github.com/pypa/setuptools/issues/2029
15+MarkupSafe<2.0.0;python_version < '3.6'
16 MarkupSafe<2.1.0;python_version >= '3.6' and python_version <= '3.8' # py38, focal
17 MarkupSafe;python_version > '3.8'
18 setuptools<42;python_version <= '3.8'

Subscribers

People subscribed via source and target branches