Merge pull request #4203 from alphagov/bump-dependencies

Remove importlib_metadata as a dependency and bump dependencies that look relatively safe

app/main/views/conversation.py

@@ -100,7 +100,7 @@ def get_user_number(service_id, notification_id):
 
 def get_sms_thread(service_id, user_number):
 
-    for notification in sorted((
+    for notification in sorted((  # noqa: B020
         notification_api_client.get_notifications_for_service(service_id,
                                                               to=user_number,
                                                               template_type='sms')['notifications'] +

app/main/views/providers.py

@@ -91,7 +91,7 @@ def edit_sms_provider_ratio():
 
 def _get_versions_since_switchover(provider_id):
 
-    for version in sorted(
+    for version in sorted(  # noqa: B020
         provider_client.get_provider_versions(provider_id)['data'],
         key=lambda version: version['updated_at'] or ''
     ):
@@ -109,7 +109,7 @@ def _chunk_versions_by_day(versions):
 
     days = defaultdict(list)
 
-    for version in sorted(versions, key=lambda version: version['updated_at'] or '', reverse=True):
+    for version in sorted(versions, key=lambda version: version['updated_at'] or '', reverse=True):  # noqa: B020
         days[
             format_date_numeric(version['updated_at'])
         ].append(version)

requirements.in

@@ -5,31 +5,30 @@ ago==0.0.93
 govuk-bank-holidays==0.11
 humanize==4.0.0
 Flask==1.1.2  # pyup: <2
-Flask-WTF==1.0.0
+Flask-WTF==1.0.1
 wtforms==3.0.1
-Flask-Login==0.5.0
+Flask-Login==0.6.0
 werkzeug==2.0.2
 jinja2==3.0.2
 
 blinker==1.4
-pyexcel==0.6.7
+pyexcel==0.7.0
 pyexcel-io==0.6.6
 pyexcel-xls==0.7.0
 pyexcel-xlsx==0.6.0
 pyexcel-ods3==0.6.0
-pytz==2021.3
+pytz==2022.1
 # Should be pinned until a new gunicorn release greater than 20.1.0 comes out. (Due to eventlet v0.33 compatibility issues)
 git+https://github.com/benoitc/gunicorn.git@1299ea9e967a61ae2edebe191082fd169b864c64#egg=gunicorn[eventlet]==20.1.0
 notifications-python-client==6.3.0
 rtreelib==0.2.0
 fido2==0.9.3
-importlib-metadata==4.2.0
+pyproj==3.3.0
-pyproj==3.2.1
 
 # PaaS
 awscli-cwlogs>=1.4,<1.5
 itsdangerous==1.1.0  # pyup: <2
-notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@55.1.1
+notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@55.1.2
 govuk-frontend-jinja @ git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha
 
 # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile requirements.in
@@ -63,11 +63,11 @@ flask==1.1.2
     #   flask-wtf
     #   gds-metrics
     #   notifications-utils
-flask-login==0.5.0
+flask-login==0.6.0
     # via -r requirements.in
 flask-redis==0.4.0
     # via notifications-utils
-flask-wtf==1.0.0
+flask-wtf==1.0.1
     # via -r requirements.in
 gds-metrics==0.2.4
     # via -r requirements.in
@@ -87,8 +87,6 @@ humanize==4.0.0
     # via -r requirements.in
 idna==2.10
     # via requests
-importlib-metadata==4.2.0
-    # via -r requirements.in
 itsdangerous==1.1.0
     # via
     #   -r requirements.in
@@ -121,7 +119,7 @@ mistune==0.8.4
     # via notifications-utils
 notifications-python-client==6.3.0
     # via -r requirements.in
-notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@55.1.0
+notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@55.1.2
     # via -r requirements.in
 openpyxl==3.0.7
     # via pyexcel-xlsx
@@ -139,7 +137,7 @@ pyasn1==0.4.8
     # via rsa
 pycparser==2.20
     # via cffi
-pyexcel==0.6.7
+pyexcel==0.7.0
     # via -r requirements.in
 pyexcel-ezodf==0.3.4
     # via pyexcel-ods3
@@ -162,7 +160,7 @@ pyparsing==2.4.7
     # via packaging
 pypdf2==1.26.0
     # via notifications-utils
-pyproj==3.2.1
+pyproj==3.3.0
     # via
     #   -r requirements.in
     #   notifications-utils
@@ -172,7 +170,7 @@ python-dateutil==2.8.1
     #   botocore
 python-json-logger==2.0.1
     # via notifications-utils
-pytz==2021.3
+pytz==2022.1
     # via
     #   -r requirements.in
     #   notifications-utils
@@ -221,6 +219,7 @@ werkzeug==2.0.2
     # via
     #   -r requirements.in
     #   flask
+    #   flask-login
 wtforms==3.0.1
     # via
     #   -r requirements.in
@@ -229,8 +228,6 @@ xlrd==1.2.0
     # via pyexcel-xls
 xlwt==1.3.0
     # via pyexcel-xls
-zipp==3.5.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements_for_test.txt

@@ -1,15 +1,15 @@
 -r requirements.txt
 isort==5.10.1
-pytest==7.0.1
+pytest==7.1.1
 pytest-env==0.6.2
 pytest-mock==3.7.0
 pytest-xdist==2.5.0
 beautifulsoup4==4.10.0
-freezegun==1.1.0
+freezegun==1.2.0
 flake8==4.0.1
-flake8-bugbear==22.1.11
+flake8-bugbear==22.3.23
 flake8-print==4.0.0
-moto==3.0.5
+moto==3.1.4
 requests-mock==1.9.3
 # used for creating manifest file locally
-jinja2-cli[yaml]==0.8.1
+jinja2-cli[yaml]==0.8.2

tests/app/main/views/test_templates.py

@@ -1288,7 +1288,7 @@ def test_choose_a_template_to_copy(
 
     assert len(actual) == len(expected)
 
-    for actual, expected in zip(actual, expected):
+    for actual, expected in zip(actual, expected):  # noqa: B020
         assert normalize_spaces(actual.text) == expected
 
     links = page.select('main nav a')
@@ -1354,7 +1354,7 @@ def test_choose_a_template_to_copy_when_user_has_one_service(
 
     assert len(actual) == len(expected)
 
-    for actual, expected in zip(actual, expected):
+    for actual, expected in zip(actual, expected):  # noqa: B020
         assert normalize_spaces(actual.text) == expected
 
     assert page.select('main nav a')[0]['href'] == url_for(
@@ -1437,7 +1437,7 @@ def test_choose_a_template_to_copy_from_folder_within_service(
 
     assert len(actual) == len(expected)
 
-    for actual, expected in zip(actual, expected):
+    for actual, expected in zip(actual, expected):  # noqa: B020
         assert normalize_spaces(actual.text) == expected
 
     links = page.select('main nav a')