From fc13d2daa6184e14aa4f0b915b794ba50f2eaa18 Mon Sep 17 00:00:00 2001
From: Michael Manganiello <adamantike@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:19:58 -0300
Subject: [PATCH 1/2] 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
---
 core/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/setup.py b/core/setup.py
index 68cc6165c81..4aa7a3629da 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",

From b79e5e295277bed10652b4b04cc7e7a4126682f4 Mon Sep 17 00:00:00 2001
From: Michael Manganiello <adamantike@users.noreply.github.com>
Date: Wed, 13 Apr 2022 15:20:25 -0300
Subject: [PATCH 2/2] Add changelog entry

---
 .changes/unreleased/Fixes-20220413-151735.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 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"