From 9f5688bf84e0c03dd8d8899cf44e93b27a958ca7 Mon Sep 17 00:00:00 2001 From: leahwicz <60146280+leahwicz@users.noreply.github.com> Date: Tue, 19 Apr 2022 14:37:53 -0400 Subject: [PATCH] Flexibilize MarkupSafe pinned version (#5039) (#5110) * Flexibilize MarkupSafe pinned version The current `MarkupSafe` pinned version has been added in #4746 as a temporary fix for #4745. However, the current restrictive approach isn't compatible with other libraries that could require an even older version of `MarkupSafe`, like Airflow `2.2.2` [0], which requires `markupsafe>=1.1.1, <2.0`. To avoid that issue, we can allow a greater range of supported `MarkupSafe` versions. Considering the direct dependency `dbt-core` has is `Jinja2==2.11.3`, we can use its pinning as the lower bound, which is `MarkupSafe>=0.23` [1]. This fix should be also backported this to `1.0.latest` for inclusion in the next v1.0 patch. [0] https://github.com/adamantike/airflow/blob/2.2.2/setup.cfg#L125 [1] https://github.com/pallets/jinja/blob/2.11.3/setup.py#L53 Co-authored-by: Michael Manganiello --- .changes/unreleased/Fixes-20220413-151735.yaml | 7 +++++++ core/setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changes/unreleased/Fixes-20220413-151735.yaml diff --git a/.changes/unreleased/Fixes-20220413-151735.yaml b/.changes/unreleased/Fixes-20220413-151735.yaml new file mode 100644 index 00000000000..cdca821dc6a --- /dev/null +++ b/.changes/unreleased/Fixes-20220413-151735.yaml @@ -0,0 +1,7 @@ +kind: Fixes +body: Relax minimum supported version of MarkupSafe +time: 2022-04-13T15:17:35.055274145-03:00 +custom: + Author: adamantike + Issue: "4745" + PR: "5039" diff --git a/core/setup.py b/core/setup.py index cf82825d1d1..5fda3cfcdf3 100644 --- a/core/setup.py +++ b/core/setup.py @@ -52,7 +52,7 @@ ], install_requires=[ 'Jinja2==2.11.3', - 'MarkupSafe==2.0.1', + 'MarkupSafe>=0.23,<2.1', 'agate>=1.6,<1.6.4', 'click>=7.0,<9', 'colorama>=0.3.9,<0.4.5',