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: Junien F
Approved revision: 5facc6d234e7f4baf79730b9901db5d525d53e7e
Merged at revision: c69b928cc22875e3426cfb76879d6b6d5e5dd0aa
Proposed branch: ~hloeung/ubuntu-repository-cache:fixes
Merge into: ubuntu-repository-cache:master
Diff against target: 15 lines (+3/-1)
1 file modified
wheelhouse.txt (+3/-1)
Reviewer Review Type Date Requested Status
Junien F Approve
Canonical IS Reviewers Pending
Review via email: mp+431889@code.launchpad.net

Commit message

Fix issue with "'ImportError: cannot import name 'soft_unicode' from 'markupsafe'" on Focal

To post a comment you must log in.
Revision history for this message
Junien F (axino) wrote :

+1

review: Approve
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 c69b928cc22875e3426cfb76879d6b6d5e5dd0aa

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 bdd6853..1b7a70e 100644
3--- a/wheelhouse.txt
4+++ b/wheelhouse.txt
5@@ -1,7 +1,9 @@
6 # Include python requirements here
7 # Focal failures - https://github.com/juju-solutions/layer-basic/issues/210
8-Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py35, focal
9+Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py38, focal
10 Jinja2;python_version > '3.8'
11+MarkupSafe<2.1.0;python_version >= '3.6' and python_version <= '3.8' # py38, focal
12+MarkupSafe;python_version > '3.8'
13 setuptools<42;python_version <= '3.8'
14 setuptools;python_version > '3.8'
15 setuptools-scm<=1.17.0;python_version <= '3.8'

Subscribers

People subscribed via source and target branches