Merge pull request #3906 from alphagov/pyup-scheduled-update-2021-05-31

Scheduled weekly dependency update for week 22

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']:

requirements.in

@@ -3,9 +3,9 @@
 
 ago==0.0.93
 govuk-bank-holidays==0.8
-humanize==3.4.0
-Flask==1.1.2
-Flask-WTF==0.14.3
+humanize==3.6.0
+Flask==1.1.2  # pyup: <2
+Flask-WTF==0.15.1
 Flask-Login==0.5.0
 
 blinker==1.4
@@ -17,21 +17,21 @@ 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
 
 # PaaS
 awscli-cwlogs>=1.4,<1.5
-itsdangerous==1.1.0
+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
+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`.

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
@@ -18,22 +18,22 @@ blinker==1.4
     # via
     #   -r requirements.in
     #   gds-metrics
-boto3==1.17.51
+boto3==1.17.84
     # via notifications-utils
-botocore==1.20.51
+botocore==1.20.84
     # via
     #   awscli
     #   boto3
     #   s3transfer
-cachetools==4.2.1
+cachetools==4.2.2
     # via notifications-utils
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
 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
@@ -47,7 +47,7 @@ docopt==0.6.2
     # via notifications-python-client
 docutils==0.15.2
     # via awscli
-et-xmlfile==1.0.1
+et-xmlfile==1.1.0
     # via openpyxl
 eventlet==0.30.2 # pyup: ignore
     # via -r requirements.in
@@ -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==1.1.2
     # via
@@ -77,14 +77,16 @@ 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
-humanize==3.4.0
+humanize==3.6.0
     # via -r requirements.in
 idna==2.10
     # via requests
+importlib-metadata==4.4.0
+    # via click
 itsdangerous==1.1.0
     # via
     #   -r requirements.in
@@ -108,13 +110,13 @@ lxml==4.6.3
     # via
     #   pyexcel-ezodf
     #   pyexcel-ods3
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via
     #   jinja2
     #   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
@@ -124,7 +126,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
@@ -151,7 +153,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
@@ -183,7 +185,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
@@ -191,7 +193,7 @@ shapely==1.7.1
     # via
     #   -r requirements.in
     #   notifications-utils
-six==1.15.0
+six==1.16.0
     # via
     #   awscli-cwlogs
     #   bleach
@@ -206,7 +208,9 @@ statsd==3.3.0
     # via notifications-utils
 texttable==1.6.3
     # via pyexcel
-urllib3==1.26.4
+typing-extensions==3.10.0.0
+    # via importlib-metadata
+urllib3==1.26.5
     # via
     #   botocore
     #   requests
@@ -220,6 +224,8 @@ 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

requirements_for_test.txt

@@ -1,14 +1,14 @@
 -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-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
+requests-mock==1.9.3
 # used for creating manifest file locally
 jinja2-cli[yaml]==0.7.0