From baec77ade7ef5ff13d472570cbbbe4e886ca739f Mon Sep 17 00:00:00 2001 From: Haw Loeung Date: Wed, 19 Oct 2022 12:24:21 +1100 Subject: [PATCH 1/4] Pin Jinja2, setuptools, and setuptools-scm to fix issues with Focal --- wheelhouse.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wheelhouse.txt b/wheelhouse.txt index 2437af5..eaccc02 100644 --- a/wheelhouse.txt +++ b/wheelhouse.txt @@ -8,6 +8,8 @@ pip<22.1;python_version >= '3.8' # for trusty Jinja2==2.10;python_version >= '3.0' and python_version <= '3.4' # py3 trusty Jinja2==2.11;python_version == '2.7' or python_version == '3.5' # py27, py35 +# Focal failures - https://github.com/juju-solutions/layer-basic/issues/210 +Jinja2==2.11;python_version == '3.8' # py38 focal Jinja2;python_version >= '3.6' # py36 and on PyYAML==5.2;python_version >= '3.0' and python_version <= '3.4' # py3 trusty @@ -17,12 +19,12 @@ MarkupSafe<2.0.0;python_version < '3.6' MarkupSafe<2.1.0;python_version == '3.6' # Just for python 3.6 MarkupSafe;python_version >= '3.7' # newer pythons -setuptools<42;python_version < '3.8' +setuptools<42;python_version <= '3.8' # https://github.com/juju-solutions/layer-basic/issues/201 -setuptools<62.2.0;python_version >= '3.8' -setuptools-scm<=1.17.0;python_version < '3.8' +setuptools<62.2.0;python_version > '3.8' +setuptools-scm<=1.17.0;python_version <= '3.8' # https://github.com/pypa/setuptools_scm/issues/722 -setuptools-scm<7;python_version >= '3.8' +setuptools-scm<7;python_version > '3.8' flit_core;python_version >= '3.8' charmhelpers>=0.4.0,<2.0.0 charms.reactive>=0.1.0,<2.0.0 From c3769e78e5e77c58408fe3c67be7494f276d9067 Mon Sep 17 00:00:00 2001 From: Haw Loeung Date: Thu, 20 Oct 2022 09:08:42 +1100 Subject: [PATCH 2/4] Fix pinning of Jinja2 and unpin setuptools & setuptools-scm per review --- wheelhouse.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/wheelhouse.txt b/wheelhouse.txt index eaccc02..36bf249 100644 --- a/wheelhouse.txt +++ b/wheelhouse.txt @@ -9,8 +9,8 @@ pip<22.1;python_version >= '3.8' Jinja2==2.10;python_version >= '3.0' and python_version <= '3.4' # py3 trusty Jinja2==2.11;python_version == '2.7' or python_version == '3.5' # py27, py35 # Focal failures - https://github.com/juju-solutions/layer-basic/issues/210 -Jinja2==2.11;python_version == '3.8' # py38 focal -Jinja2;python_version >= '3.6' # py36 and on +Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py35, focal +Jinja2;python_version > '3.8' PyYAML==5.2;python_version >= '3.0' and python_version <= '3.4' # py3 trusty PyYAML<5.4;python_version == '2.7' or python_version >= '3.5' # all else @@ -20,11 +20,9 @@ MarkupSafe<2.1.0;python_version == '3.6' # Just for python 3.6 MarkupSafe;python_version >= '3.7' # newer pythons setuptools<42;python_version <= '3.8' -# https://github.com/juju-solutions/layer-basic/issues/201 -setuptools<62.2.0;python_version > '3.8' +setuptools;python_version > '3.8' setuptools-scm<=1.17.0;python_version <= '3.8' -# https://github.com/pypa/setuptools_scm/issues/722 -setuptools-scm<7;python_version > '3.8' +setuptools-scm;python_version > '3.8' flit_core;python_version >= '3.8' charmhelpers>=0.4.0,<2.0.0 charms.reactive>=0.1.0,<2.0.0 From c5f0dece8ce305cc88060b0c3b4f5e334eb5c181 Mon Sep 17 00:00:00 2001 From: Haw Loeung Date: Thu, 20 Oct 2022 17:46:29 +1100 Subject: [PATCH 3/4] Need to pin MarkupSafe for Py38 / Focal This fixes the issue with with "'ImportError: cannot import name 'soft_unicode' from 'markupsafe'" on Focal. --- wheelhouse.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wheelhouse.txt b/wheelhouse.txt index 36bf249..8b25a2d 100644 --- a/wheelhouse.txt +++ b/wheelhouse.txt @@ -9,15 +9,15 @@ pip<22.1;python_version >= '3.8' Jinja2==2.10;python_version >= '3.0' and python_version <= '3.4' # py3 trusty Jinja2==2.11;python_version == '2.7' or python_version == '3.5' # py27, py35 # Focal failures - https://github.com/juju-solutions/layer-basic/issues/210 -Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py35, focal +Jinja2==2.11;python_version >= '3.6' and python_version <= '3.8' # py38, focal Jinja2;python_version > '3.8' PyYAML==5.2;python_version >= '3.0' and python_version <= '3.4' # py3 trusty PyYAML<5.4;python_version == '2.7' or python_version >= '3.5' # all else MarkupSafe<2.0.0;python_version < '3.6' -MarkupSafe<2.1.0;python_version == '3.6' # Just for python 3.6 -MarkupSafe;python_version >= '3.7' # newer pythons +MarkupSafe<2.1.0;python_version >= '3.6' and python_version <= '3.8' # py38, focal +MarkupSafe;python_version > '3.8' setuptools<42;python_version <= '3.8' setuptools;python_version > '3.8' From 226cd63a40e89608888f0a89d78bacdea5b57788 Mon Sep 17 00:00:00 2001 From: Benjamin Allot Date: Thu, 27 Oct 2022 11:53:29 +0200 Subject: [PATCH 4/4] Lower setuptools version pinned for focal There was a breaking change in v46.0.0 leading to `AttributeError: type object 'Distribution' has no attribute no attribute '_finalize_feature_opts'` --- wheelhouse.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wheelhouse.txt b/wheelhouse.txt index 8b25a2d..a0a46bf 100644 --- a/wheelhouse.txt +++ b/wheelhouse.txt @@ -19,7 +19,8 @@ MarkupSafe<2.0.0;python_version < '3.6' MarkupSafe<2.1.0;python_version >= '3.6' and python_version <= '3.8' # py38, focal MarkupSafe;python_version > '3.8' -setuptools<42;python_version <= '3.8' +setuptools<42;python_version < '3.8' +setuptools<46.0.0;python_version == '3.8' setuptools;python_version > '3.8' setuptools-scm<=1.17.0;python_version <= '3.8' setuptools-scm;python_version > '3.8'