From 9a249dc530487a6bf83062fb4460da0f1278f27d Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Tue, 19 Apr 2022 13:53:06 +0100
Subject: [PATCH] Use `jsonschema[format]` instead of `jsonschema`

`jsonschema[format]` includes all the formatting dependencies of
jsonschema, meaning that we don't have to specify `rfc3339-validator`
and `rfc3987` ourselves in the requirements.in file. This also has the
benefit of meaning that if the underlying formatting packages of
jsonschema change, we will be covered and won't accidentally miss the
fact that we need to change a package.
---
 requirements.in  |  4 +---
 requirements.txt | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/requirements.in b/requirements.in
index d920aa8e4..053435929 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,14 +13,12 @@ click-datetime==0.2
 git+https://github.com/benoitc/gunicorn.git@1299ea9e967a61ae2edebe191082fd169b864c64#egg=gunicorn[eventlet]==20.1.0
 iso8601==1.0.2
 itsdangerous==2.1.2
-jsonschema==4.4.0
+jsonschema[format]==4.4.0
 marshmallow-sqlalchemy==0.23.1 # pyup: <0.24.0 # marshmallow v3 throws errors
 marshmallow==2.21.0 # pyup: <3 # v3 throws errors
 psycopg2-binary==2.9.3
 PyJWT==2.3.0
 SQLAlchemy==1.4.35
-rfc3339-validator==0.1.4
-rfc3987==1.3.8
 cachetools==5.0.0
 beautifulsoup4==4.10.0
 lxml==4.8.0
diff --git a/requirements.txt b/requirements.txt
index c6a820a2d..59c7bca31 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,8 @@ alembic==1.7.4
     # via flask-migrate
 amqp==5.0.9
     # via kombu
+arrow==1.2.2
+    # via isoduration
 attrs==21.2.0
     # via jsonschema
 awscli==1.21.4
@@ -94,6 +96,8 @@ flask-sqlalchemy @ git+https://github.com/mitsuhiko/flask-sqlalchemy.git@500e732
     # via
     #   -r requirements.in
     #   flask-migrate
+fqdn==1.5.1
+    # via jsonschema
 gds-metrics==0.2.4
     # via -r requirements.in
 geojson==2.5.0
@@ -105,11 +109,15 @@ greenlet==1.1.2
 gunicorn @ git+https://github.com/benoitc/gunicorn.git@1299ea9e967a61ae2edebe191082fd169b864c64
     # via -r requirements.in
 idna==3.3
-    # via requests
+    # via
+    #   jsonschema
+    #   requests
 importlib-metadata==4.11.3
     # via flask
 iso8601==1.0.2
     # via -r requirements.in
+isoduration==20.11.0
+    # via jsonschema
 itsdangerous==2.1.2
     # via
     #   -r requirements.in
@@ -123,7 +131,9 @@ jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-jsonschema==4.4.0
+jsonpointer==2.3
+    # via jsonschema
+jsonschema[format]==4.4.0
     # via -r requirements.in
 kombu==5.2.3
     # via celery
@@ -180,6 +190,7 @@ pyrsistent==0.18.0
     # via jsonschema
 python-dateutil==2.8.2
     # via
+    #   arrow
     #   awscli-cwlogs
     #   botocore
 python-json-logger==2.0.2
@@ -201,9 +212,9 @@ requests==2.26.0
     #   notifications-python-client
     #   notifications-utils
 rfc3339-validator==0.1.4
-    # via -r requirements.in
+    # via jsonschema
 rfc3987==1.3.8
-    # via -r requirements.in
+    # via jsonschema
 rsa==4.7.2
     # via awscli
 s3transfer==0.5.0
@@ -233,6 +244,8 @@ sqlalchemy==1.4.35
     #   marshmallow-sqlalchemy
 statsd==3.3.0
     # via notifications-utils
+uri-template==1.2.0
+    # via jsonschema
 urllib3==1.26.7
     # via
     #   botocore
@@ -244,6 +257,8 @@ vine==5.0.0
     #   kombu
 wcwidth==0.2.5
     # via prompt-toolkit
+webcolors==1.11.1
+    # via jsonschema
 webencodings==0.5.1
     # via bleach
 werkzeug==2.0.3