From cebe55fc34a925f2a32a201446c455ba2a59086f Mon Sep 17 00:00:00 2001
From: Robin Winslow <robin@robinwinslow.co.uk>
Date: Thu, 5 May 2022 16:49:59 +0100
Subject: [PATCH 1/2] Pin to Flask 1.1.2 for now, to avoid conflicts

Flask v1.1.3 introduced upper bounds on a lot of dependencies:
https://github.com/pallets/flask/commit/6d8b4ce9d037937ef8694067ab5754666240d097

This has caused conflicts in our projects for Jinja2, click - e.g.:
https://github.com/canonical-web-and-design/ubuntu-com-security-api/runs/6309273393?check_suite_focus=true

For now, let's pin to the slightly older version of Flask.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 737995c..819d0f7 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
     packages=find_packages(),
     install_requires=[
         "canonicalwebteam.yaml-responses[flask] (>=1,<2)",
-        "flask (>=1,<2)",
+        "flask==1.1.2",
         "jinja2 (>=3,<3.1.0)",
         "gevent==21.12.0",
         "greenlet==1.1.2",

From c9a3c44d256012010e3719017d46b2b97d22f20d Mon Sep 17 00:00:00 2001
From: Robin Winslow <robin@robinwinslow.co.uk>
Date: Thu, 5 May 2022 16:56:43 +0100
Subject: [PATCH 2/2] v1.0.5

---
 CHANGELOG.md | 4 ++++
 setup.py     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93277cc..bad728c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.5 (2022-05-05)
+
+Pin to Flask 1.1.2 to avoid dependency conflicts
+
 # 1.0.4 (2022-04-26)
 
 Added support for security.txt files
diff --git a/setup.py b/setup.py
index 819d0f7..1ed276a 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="canonicalwebteam.flask-base",
-    version="1.0.4",
+    version="1.0.5",
     description=(
         "Flask extension that applies common configurations"
         "to all of webteam's flask apps."