From e26922e82a74673204e22b0e55eb2661dc35a293 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:06 +0100 Subject: [PATCH 01/40] Update humanize from 3.4.0 to 3.6.0 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index ba9ab551e..2844051e9 100644 --- a/requirements.in +++ b/requirements.in @@ -3,7 +3,7 @@ ago==0.0.93 govuk-bank-holidays==0.8 -humanize==3.4.0 +humanize==3.6.0 Flask==1.1.2 Flask-WTF==0.14.3 Flask-Login==0.5.0 From 2a7a29a48b0b32b3fea008af94e4bf59ff043cdf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:06 +0100 Subject: [PATCH 02/40] Update humanize from 3.4.0 to 3.6.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 044baf382..0a957b211 100644 --- a/requirements.txt +++ b/requirements.txt @@ -81,7 +81,7 @@ greenlet==1.0.0 # via eventlet gunicorn==20.1.0 # via -r requirements.in -humanize==3.4.0 +humanize==3.6.0 # via -r requirements.in idna==2.10 # via requests From 5d209a4ad98e926e0cc1b85cc760d8e6722c4c4a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:06 +0100 Subject: [PATCH 03/40] Update flask from 1.1.2 to 2.0.1 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 2844051e9..942dd6746 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ ago==0.0.93 govuk-bank-holidays==0.8 humanize==3.6.0 -Flask==1.1.2 +Flask==2.0.1 Flask-WTF==0.14.3 Flask-Login==0.5.0 From c78ce2a48251b1668afa6a0275b1c5c12c03d366 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:07 +0100 Subject: [PATCH 04/40] Update flask from 1.1.2 to 2.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0a957b211..9074ec981 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,7 +59,7 @@ flask-redis==0.4.0 # via notifications-utils flask-wtf==0.14.3 # via -r requirements.in -flask==1.1.2 +flask==2.0.1 # via # -r requirements.in # flask-login From 0345c951790aa7f9f49ebc55a26f5a910a9abfb1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:07 +0100 Subject: [PATCH 05/40] Update flask-wtf from 0.14.3 to 0.15.1 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 942dd6746..52ee5db72 100644 --- a/requirements.in +++ b/requirements.in @@ -5,7 +5,7 @@ ago==0.0.93 govuk-bank-holidays==0.8 humanize==3.6.0 Flask==2.0.1 -Flask-WTF==0.14.3 +Flask-WTF==0.15.1 Flask-Login==0.5.0 blinker==1.4 From d86239566dad4a37ae611cf2c0441977a38e0a93 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:08 +0100 Subject: [PATCH 06/40] Update flask-wtf from 0.14.3 to 0.15.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9074ec981..492a57a29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,7 +57,7 @@ flask-login==0.5.0 # via -r requirements.in flask-redis==0.4.0 # via notifications-utils -flask-wtf==0.14.3 +flask-wtf==0.15.1 # via -r requirements.in flask==2.0.1 # via From e7893001f38f39a349dfcca4f20606e0f99e81e5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:08 +0100 Subject: [PATCH 07/40] Update notifications-python-client from 6.0.2 to 6.1.0 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 52ee5db72..e578ec6e7 100644 --- a/requirements.in +++ b/requirements.in @@ -17,7 +17,7 @@ pyexcel-ods3==0.6.0 pytz==2021.1 gunicorn==20.1.0 eventlet==0.30.2 # pyup: ignore -notifications-python-client==6.0.2 +notifications-python-client==6.1.0 Shapely==1.7.1 rtreelib==0.2.0 fido2==0.9.1 From 14f5aadef3d929f78507e64f40cb0d5b6aeb253a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:08 +0100 Subject: [PATCH 08/40] Update notifications-python-client from 6.0.2 to 6.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 492a57a29..afd969874 100644 --- a/requirements.txt +++ b/requirements.txt @@ -114,7 +114,7 @@ markupsafe==1.1.1 # wtforms mistune==0.8.4 # via notifications-utils -notifications-python-client==6.0.2 +notifications-python-client==6.1.0 # via -r requirements.in git+https://github.com/alphagov/notifications-utils.git@44.2.2#egg=notifications-utils==44.2.2 # via -r requirements.in From afcc1a90eddcf4e46fef0473ec21dd15ec423c5f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:09 +0100 Subject: [PATCH 09/40] Update itsdangerous from 1.1.0 to 2.0.1 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index e578ec6e7..b6774c3cd 100644 --- a/requirements.in +++ b/requirements.in @@ -24,7 +24,7 @@ fido2==0.9.1 # PaaS awscli-cwlogs>=1.4,<1.5 -itsdangerous==1.1.0 +itsdangerous==2.0.1 git+https://github.com/alphagov/notifications-utils.git@44.2.2#egg=notifications-utils==44.2.2 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha From 3cf17ff6bf4d9581cca736cf9e5eaba53e74a21c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:09 +0100 Subject: [PATCH 10/40] Update itsdangerous from 1.1.0 to 2.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index afd969874..9ecbe6b90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -85,7 +85,7 @@ humanize==3.6.0 # via -r requirements.in idna==2.10 # via requests -itsdangerous==1.1.0 +itsdangerous==2.0.1 # via # -r requirements.in # flask From 164a44e41b88146bcef0beef1a83df4385dadaad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:10 +0100 Subject: [PATCH 11/40] Pin cryptography to latest version 3.4.7 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index b6774c3cd..48bd4ecb3 100644 --- a/requirements.in +++ b/requirements.in @@ -31,7 +31,7 @@ git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk- # cryptography 3.4+ incorporates Rust code, which isn't supported on PaaS # e.g. https://github.com/alphagov/notifications-api/pull/3126 -cryptography<3.4 +cryptography==3.4.7 # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains # version 0.10.0 introduced exceptions when workers crashed due to deprecating lower case `prometheus_multiproc_dir`. From 96e5950de78a6bb1f5ffb98655b9a63e88dd6263 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:10 +0100 Subject: [PATCH 12/40] Update pytest from 6.2.3 to 6.2.4 --- requirements_for_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 240e08e41..a4c927bb1 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -1,6 +1,6 @@ -r requirements.txt isort==5.8.0 -pytest==6.2.3 +pytest==6.2.4 pytest-env==0.6.2 pytest-mock==3.5.1 pytest-xdist==2.2.1 From 6177937014a84af569a0abb4d5eb3377e80dc14e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:11 +0100 Subject: [PATCH 13/40] Update pytest-mock from 3.5.1 to 3.6.1 --- requirements_for_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index a4c927bb1..2f3cb240e 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -2,7 +2,7 @@ isort==5.8.0 pytest==6.2.4 pytest-env==0.6.2 -pytest-mock==3.5.1 +pytest-mock==3.6.1 pytest-xdist==2.2.1 beautifulsoup4==4.9.3 freezegun==1.1.0 From d4f11a3b402bbc9ea45ea57803d7fd1de6130663 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:11 +0100 Subject: [PATCH 14/40] Update flake8 from 3.9.0 to 3.9.2 --- requirements_for_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 2f3cb240e..b216b3feb 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -6,7 +6,7 @@ pytest-mock==3.6.1 pytest-xdist==2.2.1 beautifulsoup4==4.9.3 freezegun==1.1.0 -flake8==3.9.0 +flake8==3.9.2 flake8-bugbear==21.4.3 flake8-print==4.0.0 requests-mock==1.8.0 From c832e115239c327bf151353795a9ecb88d170bc3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:12 +0100 Subject: [PATCH 15/40] Update requests-mock from 1.8.0 to 1.9.3 --- requirements_for_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index b216b3feb..03530e152 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -9,6 +9,6 @@ freezegun==1.1.0 flake8==3.9.2 flake8-bugbear==21.4.3 flake8-print==4.0.0 -requests-mock==1.8.0 +requests-mock==1.9.3 # used for creating manifest file locally jinja2-cli[yaml]==0.7.0 From 5b6125aef05c73068c9bcf93c002b85f27299ea6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:12 +0100 Subject: [PATCH 16/40] Update awscli from 1.19.51 to 1.19.84 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9ecbe6b90..b62d895da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ ago==0.0.93 # via -r requirements.in awscli-cwlogs==1.4.6 # via -r requirements.in -awscli==1.19.51 +awscli==1.19.84 # via # awscli-cwlogs # notifications-utils From 176966ff838273a46c2c75502f32d9cd3c998b81 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:12 +0100 Subject: [PATCH 17/40] Update boto3 from 1.17.51 to 1.17.84 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b62d895da..08fe484c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ blinker==1.4 # via # -r requirements.in # gds-metrics -boto3==1.17.51 +boto3==1.17.84 # via notifications-utils botocore==1.20.51 # via From 82d08522e635d77949be438137a99e61b5092e2d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:13 +0100 Subject: [PATCH 18/40] Update botocore from 1.20.51 to 1.20.84 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 08fe484c9..c181de0c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ blinker==1.4 # gds-metrics boto3==1.17.84 # via notifications-utils -botocore==1.20.51 +botocore==1.20.84 # via # awscli # boto3 From 22adea55b02da6e7c610f19dbb6adf72a7020ebd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:13 +0100 Subject: [PATCH 19/40] Update cachetools from 4.2.1 to 4.2.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c181de0c0..e66a8532d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ botocore==1.20.84 # awscli # boto3 # s3transfer -cachetools==4.2.1 +cachetools==4.2.2 # via notifications-utils certifi==2020.12.5 # via requests From a6ea8dbe4677bf0c131a0bcaf63e617bed2db990 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:14 +0100 Subject: [PATCH 20/40] Update certifi from 2020.12.5 to 2021.5.30 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e66a8532d..2b3a556ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ botocore==1.20.84 # s3transfer cachetools==4.2.2 # via notifications-utils -certifi==2020.12.5 +certifi==2021.5.30 # via requests cffi==1.14.5 # via cryptography From 48ae94efa7ab5db451646d26fc56b394fb9dbccb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:14 +0100 Subject: [PATCH 21/40] Update click from 7.1.2 to 8.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2b3a556ad..fbb5b7e37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,7 +33,7 @@ cffi==1.14.5 # via cryptography chardet==4.0.0 # via requests -click==7.1.2 +click==8.0.1 # via flask colorama==0.4.3 # via awscli From 1de542bd0587640e47dbe1668fe5a94426b47614 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:15 +0100 Subject: [PATCH 22/40] Update colorama from 0.4.3 to 0.4.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fbb5b7e37..c3727fe62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ chardet==4.0.0 # via requests click==8.0.1 # via flask -colorama==0.4.3 +colorama==0.4.4 # via awscli cryptography==3.3.2 # via From c72022307c78f6a3762e204f5a408694cf253ba5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:15 +0100 Subject: [PATCH 23/40] Update cryptography from 3.3.2 to 3.4.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c3727fe62..6414f6aba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ click==8.0.1 # via flask colorama==0.4.4 # via awscli -cryptography==3.3.2 +cryptography==3.4.7 # via # -r requirements.in # fido2 From 79e1273d82a7163b6bcc89c759ec9c331c48d14a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:16 +0100 Subject: [PATCH 24/40] Update dnspython from 1.16.0 to 2.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6414f6aba..881c85d2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,7 +41,7 @@ cryptography==3.4.7 # via # -r requirements.in # fido2 -dnspython==1.16.0 +dnspython==2.1.0 # via eventlet docopt==0.6.2 # via notifications-python-client From 3487087f4a5a551e778587673e077047611203d0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:16 +0100 Subject: [PATCH 25/40] Update docutils from 0.15.2 to 0.17.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 881c85d2e..84564240d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,7 +45,7 @@ dnspython==2.1.0 # via eventlet docopt==0.6.2 # via notifications-python-client -docutils==0.15.2 +docutils==0.17.1 # via awscli et-xmlfile==1.0.1 # via openpyxl From a00db30546be26fb8520299f11d657a2c5dcd15f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:17 +0100 Subject: [PATCH 26/40] Update et-xmlfile from 1.0.1 to 1.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 84564240d..8216eb73e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ docopt==0.6.2 # via notifications-python-client docutils==0.17.1 # via awscli -et-xmlfile==1.0.1 +et-xmlfile==1.1.0 # via openpyxl eventlet==0.30.2 # pyup: ignore # via -r requirements.in From b4a9fe21b66b63f46d42f88d7943a0b15135c81a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:17 +0100 Subject: [PATCH 27/40] Update greenlet from 1.0.0 to 1.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8216eb73e..2e58b10bd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -77,7 +77,7 @@ govuk-bank-holidays==0.8 # notifications-utils git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha # via -r requirements.in -greenlet==1.0.0 +greenlet==1.1.0 # via eventlet gunicorn==20.1.0 # via -r requirements.in From 0e15653939ef0284a4514dff1ddf6279370bb84f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:17 +0100 Subject: [PATCH 28/40] Update idna from 2.10 to 3.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2e58b10bd..a4c5592de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -83,7 +83,7 @@ gunicorn==20.1.0 # via -r requirements.in humanize==3.6.0 # via -r requirements.in -idna==2.10 +idna==3.2 # via requests itsdangerous==2.0.1 # via From 9563138d6f7491a87b25d21efd2b1d8434677487 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:18 +0100 Subject: [PATCH 29/40] Update jinja2 from 2.11.3 to 3.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a4c5592de..768ffd849 100644 --- a/requirements.txt +++ b/requirements.txt @@ -91,7 +91,7 @@ itsdangerous==2.0.1 # flask # flask-wtf # notifications-utils -jinja2==2.11.3 +jinja2==3.0.1 # via # flask # govuk-frontend-jinja From 934a144725f881cc9728befe80181c48ac9b308a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:18 +0100 Subject: [PATCH 30/40] Update markupsafe from 1.1.1 to 2.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 768ffd849..8c1d482fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -108,7 +108,7 @@ lxml==4.6.3 # via # pyexcel-ezodf # pyexcel-ods3 -markupsafe==1.1.1 +markupsafe==2.0.1 # via # jinja2 # wtforms From 25418ddb04400cda68b92a14048819fe3b1ae523 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:19 +0100 Subject: [PATCH 31/40] Update phonenumbers from 8.12.21 to 8.12.24 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8c1d482fb..3293e9eb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -124,7 +124,7 @@ orderedset==2.0.3 # via notifications-utils packaging==20.9 # via bleach -phonenumbers==8.12.21 +phonenumbers==8.12.24 # via notifications-utils prometheus-client==0.10.1 # via From c2ee4001238ce482158cdfd2661eb029fd09da53 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:19 +0100 Subject: [PATCH 32/40] Update pyjwt from 2.0.1 to 2.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3293e9eb5..98666a360 100644 --- a/requirements.txt +++ b/requirements.txt @@ -151,7 +151,7 @@ pyexcel-xlsx==0.6.0 # via -r requirements.in pyexcel==0.6.6 # via -r requirements.in -pyjwt==2.0.1 +pyjwt==2.1.0 # via notifications-python-client pyparsing==2.4.7 # via packaging From ea13a9495213ba695808b3cc1616800460345f9f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:20 +0100 Subject: [PATCH 33/40] Update s3transfer from 0.3.7 to 0.4.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 98666a360..88b27d6f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -183,7 +183,7 @@ rsa==4.7.2 # via awscli rtreelib==0.2.0 # via -r requirements.in -s3transfer==0.3.7 +s3transfer==0.4.2 # via # awscli # boto3 From 69141eb13c2af463ab44d712e8672dbe0a744e25 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:20 +0100 Subject: [PATCH 34/40] Update six from 1.15.0 to 1.16.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 88b27d6f4..52847473e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -191,7 +191,7 @@ shapely==1.7.1 # via # -r requirements.in # notifications-utils -six==1.15.0 +six==1.16.0 # via # awscli-cwlogs # bleach From ee16845c651a587e7f823735816fad61d072af96 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:21 +0100 Subject: [PATCH 35/40] Update urllib3 from 1.26.4 to 1.26.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 52847473e..2fdeb771d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -206,7 +206,7 @@ statsd==3.3.0 # via notifications-utils texttable==1.6.3 # via pyexcel -urllib3==1.26.4 +urllib3==1.26.5 # via # botocore # requests From 4e82afeae6cdfeb7a15681c5dadf5ce725647001 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:21 +0100 Subject: [PATCH 36/40] Update werkzeug from 1.0.1 to 2.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2fdeb771d..dc10a1a87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -212,7 +212,7 @@ urllib3==1.26.5 # requests webencodings==0.5.1 # via bleach -werkzeug==1.0.1 +werkzeug==2.0.1 # via flask wtforms==2.3.3 # via flask-wtf From 69a498cbd031e592c8c7aa91d5fcff2e1fdbcdb0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 14:54:22 +0100 Subject: [PATCH 37/40] Update xlrd from 1.2.0 to 2.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dc10a1a87..cdd4d091f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -216,7 +216,7 @@ werkzeug==2.0.1 # via flask wtforms==2.3.3 # via flask-wtf -xlrd==1.2.0 +xlrd==2.0.1 # via pyexcel-xls xlwt==1.3.0 # via pyexcel-xls From 0888ecb6288df355f04f532bf5827206fd5b2abc Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 2 Jun 2021 15:11:00 +0100 Subject: [PATCH 38/40] Freeze requirements --- requirements.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index cdd4d091f..c6fc64ce9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,17 +35,17 @@ chardet==4.0.0 # via requests click==8.0.1 # via flask -colorama==0.4.4 +colorama==0.4.3 # via awscli cryptography==3.4.7 # via # -r requirements.in # fido2 -dnspython==2.1.0 +dnspython==1.16.0 # via eventlet docopt==0.6.2 # via notifications-python-client -docutils==0.17.1 +docutils==0.15.2 # via awscli et-xmlfile==1.1.0 # via openpyxl @@ -83,8 +83,10 @@ gunicorn==20.1.0 # via -r requirements.in humanize==3.6.0 # via -r requirements.in -idna==3.2 +idna==2.10 # via requests +importlib-metadata==4.4.0 + # via click itsdangerous==2.0.1 # via # -r requirements.in @@ -195,7 +197,6 @@ six==1.16.0 # via # awscli-cwlogs # bleach - # cryptography # eventlet # fido2 # govuk-bank-holidays @@ -206,6 +207,8 @@ statsd==3.3.0 # via notifications-utils texttable==1.6.3 # via pyexcel +typing-extensions==3.10.0.0 + # via importlib-metadata urllib3==1.26.5 # via # botocore @@ -216,10 +219,12 @@ werkzeug==2.0.1 # via flask wtforms==2.3.3 # via flask-wtf -xlrd==2.0.1 +xlrd==1.2.0 # via pyexcel-xls xlwt==1.3.0 # via pyexcel-xls +zipp==3.4.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools From 7832c862a1e1c00dc60681c911516183f78f4402 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 2 Jun 2021 15:24:38 +0100 Subject: [PATCH 39/40] Pin Flask to less than version 2 Flask 2.0 requires Jinja 3.0 govuk_frontend_jinja is not compatible with Jinja 3.0 yet --- requirements.in | 6 +++--- requirements.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/requirements.in b/requirements.in index 48bd4ecb3..94cc82379 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ ago==0.0.93 govuk-bank-holidays==0.8 humanize==3.6.0 -Flask==2.0.1 +Flask==1.1.2 # pyup: <2 Flask-WTF==0.15.1 Flask-Login==0.5.0 @@ -24,14 +24,14 @@ fido2==0.9.1 # PaaS awscli-cwlogs>=1.4,<1.5 -itsdangerous==2.0.1 +itsdangerous==1.1.0 # pyup: <2 git+https://github.com/alphagov/notifications-utils.git@44.2.2#egg=notifications-utils==44.2.2 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha # cryptography 3.4+ incorporates Rust code, which isn't supported on PaaS # e.g. https://github.com/alphagov/notifications-api/pull/3126 -cryptography==3.4.7 +cryptography<3.4 # pyup: ignore # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains # version 0.10.0 introduced exceptions when workers crashed due to deprecating lower case `prometheus_multiproc_dir`. diff --git a/requirements.txt b/requirements.txt index c6fc64ce9..83a11ef77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ click==8.0.1 # via flask colorama==0.4.3 # via awscli -cryptography==3.4.7 +cryptography==3.3.2 # via # -r requirements.in # fido2 @@ -59,7 +59,7 @@ flask-redis==0.4.0 # via notifications-utils flask-wtf==0.15.1 # via -r requirements.in -flask==2.0.1 +flask==1.1.2 # via # -r requirements.in # flask-login @@ -87,13 +87,13 @@ idna==2.10 # via requests importlib-metadata==4.4.0 # via click -itsdangerous==2.0.1 +itsdangerous==1.1.0 # via # -r requirements.in # flask # flask-wtf # notifications-utils -jinja2==3.0.1 +jinja2==2.11.3 # via # flask # govuk-frontend-jinja @@ -197,6 +197,7 @@ six==1.16.0 # via # awscli-cwlogs # bleach + # cryptography # eventlet # fido2 # govuk-bank-holidays @@ -215,7 +216,7 @@ urllib3==1.26.5 # requests webencodings==0.5.1 # via bleach -werkzeug==2.0.1 +werkzeug==1.0.1 # via flask wtforms==2.3.3 # via flask-wtf From e6bbe3f6a54ec8eb2ecc143ef3b9175ddc31fe88 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 2 Jun 2021 15:17:29 +0100 Subject: [PATCH 40/40] Remove Python 2 compatibility code This will make it easier to upgrade to Flask 3.0 in the future. --- app/formatters.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/formatters.py b/app/formatters.py index 612e45113..91ecdbb5c 100644 --- a/app/formatters.py +++ b/app/formatters.py @@ -10,7 +10,6 @@ import ago import dateutil import humanize from flask import Markup, url_for -from flask._compat import string_types from notifications_utils.field import Field from notifications_utils.formatters import make_quotes_smart from notifications_utils.formatters import nl2br as utils_nl2br @@ -23,7 +22,7 @@ from notifications_utils.timezones import utc_string_to_aware_gmt_datetime def convert_to_boolean(value): - if isinstance(value, string_types): + if isinstance(value, str): if value.lower() in ['t', 'true', 'on', 'yes', '1']: return True elif value.lower() in ['f', 'false', 'off', 'no', '0']: