From 8ea2f49ee6bd52f271a137518fde9031f4f89d7b Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 27 May 2022 14:27:21 +0100
Subject: [PATCH] Bump Flask, Jinja and Werkzeug to latest versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that we’ve upgraded itsdangerous to the latest version we are:
- unblocked from upgrading to Flask 2, which requires a recent version
  of itsdangerous
- unblocked from upgrading Jinja and Werkzeug to the latest versions,
  which require Flask 2

This commit just does the version upgrades, breaking changes will be
addressed in subsequent commits.
---
 requirements.in  |  6 +++---
 requirements.txt | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/requirements.in b/requirements.in
index 37b5a0c47..d04f2fa18 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,12 +4,12 @@
 ago==0.0.93
 govuk-bank-holidays==0.11
 humanize==4.1.0
-Flask==1.1.2  # pyup: <1.1.3
+Flask==2.1.2
 Flask-WTF==1.0.1
 wtforms==3.0.1
 Flask-Login==0.6.1
-werkzeug==2.0.3  # pyup: <2.1
-jinja2==3.0.3  # pyup: <3.1
+Werkzeug==2.1.2
+jinja2==3.1.2
 
 blinker==1.4
 pyexcel==0.7.0
diff --git a/requirements.txt b/requirements.txt
index 41b4e7f46..2b7726ca1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -57,7 +57,7 @@ eventlet==0.33.1
     # via gunicorn
 fido2==0.9.3
     # via -r requirements.in
-flask==1.1.2
+flask==2.1.2
     # via
     #   -r requirements.in
     #   flask-login
@@ -89,13 +89,15 @@ humanize==4.1.0
     # via -r requirements.in
 idna==3.3
     # via requests
+importlib-metadata==4.11.4
+    # via flask
 itsdangerous==2.0.1
     # via
     #   -r requirements.in
     #   flask
     #   flask-wtf
     #   notifications-utils
-jinja2==3.0.3
+jinja2==3.1.2
     # via
     #   -r requirements.in
     #   flask
@@ -219,7 +221,7 @@ urllib3==1.26.9
     #   requests
 webencodings==0.5.1
     # via bleach
-werkzeug==2.0.3
+werkzeug==2.1.2
     # via
     #   -r requirements.in
     #   flask
@@ -234,6 +236,8 @@ xlrd==2.0.1
     # via pyexcel-xls
 xlwt==1.3.0
     # via pyexcel-xls
+zipp==3.8.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools