Merge pull request #3476 from alphagov/upgrade-some-dependencies

Upgrade some dependencies

app/celery/nightly_tasks.py

@@ -255,7 +255,7 @@ def letter_raise_alert_if_no_ack_file_for_zip():
 
     for key in s3.get_list_of_files_by_suffix(bucket_name=current_app.config['DVLA_RESPONSE_BUCKET_NAME'],
                                               subfolder='root/dispatch', suffix='.ACK.txt', last_modified=yesterday):
-        ack_file_set.add(key.lstrip('root/dispatch').upper().replace('.ACK.TXT', ''))
+        ack_file_set.add(key.lstrip('root/dispatch').upper().replace('.ACK.TXT', ''))  # noqa
 
     message = '\n'.join([
         "Letter ack file does not contain all zip files sent."

app/dao/services_dao.py

@@ -544,8 +544,8 @@ def dao_find_services_sending_to_tv_numbers(start_date, end_date, threshold=500)
         Notification.notification_type == SMS_TYPE,
         func.substr(Notification.normalised_to, 3, 7) == '7700900',
         Service.restricted == False,  # noqa
-        Service.research_mode == False,
-        Service.active == True,
+        Service.research_mode == False,  # noqa
+        Service.active == True,  # noqa
     ).group_by(
         Notification.service_id,
     ).having(
@@ -564,8 +564,8 @@ def dao_find_services_with_high_failure_rates(start_date, end_date, threshold=10
         Notification.key_type != KEY_TYPE_TEST,
         Notification.notification_type == SMS_TYPE,
         Service.restricted == False,  # noqa
-        Service.research_mode == False,
-        Service.active == True,
+        Service.research_mode == False,  # noqa
+        Service.active == True,  # noqa
     ).group_by(
         Notification.service_id,
     ).having(
@@ -590,8 +590,8 @@ def dao_find_services_with_high_failure_rates(start_date, end_date, threshold=10
         Notification.notification_type == SMS_TYPE,
         Notification.status == NOTIFICATION_PERMANENT_FAILURE,
         Service.restricted == False,  # noqa
-        Service.research_mode == False,
-        Service.active == True,
+        Service.research_mode == False,  # noqa
+        Service.active == True,  # noqa
     ).group_by(
         Notification.service_id,
         subquery.c.total_count

app/dao/uploads_dao.py

@@ -84,7 +84,7 @@ def dao_get_uploads_by_service_id(service_id, limit_days=None, page=1, page_size
         Notification.notification_type == LETTER_TYPE,
         Notification.api_key_id == None,  # noqa
         Notification.status != NOTIFICATION_CANCELLED,
-        Template.hidden == True,
+        Template.hidden == True,  # noqa
         Notification.created_at >= today - func.coalesce(ServiceDataRetention.days_of_retention, 7)
     ]
     if limit_days is not None:

requirements.in

@@ -2,31 +2,31 @@
 # with package version changes made in requirements-app.txt
 
 cffi==1.15.0
-celery[sqs]==5.2.0
+celery[sqs]==5.2.3
 Flask-Bcrypt==0.7.1
 flask-marshmallow==0.14.0
-Flask-Migrate==2.7.0
+Flask-Migrate==3.1.0
 git+https://github.com/mitsuhiko/flask-sqlalchemy.git@500e732dd1b975a56ab06a46bd1a20a21e682262#egg=Flask-SQLAlchemy==2.3.2.dev20190108
 Flask==1.1.2
 click-datetime==0.2
 # 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
-iso8601==0.1.14
+iso8601==1.0.2
 itsdangerous==1.1.0
 jsonschema==3.2.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.8.6
+psycopg2-binary==2.9.3
 PyJWT==2.0.1
 SQLAlchemy==1.4.10
 strict-rfc3339==0.7
 rfc3987==1.3.8
 cachetools==4.2.1
 beautifulsoup4==4.9.3
-lxml==4.7.1
+lxml==4.8.0
 Werkzeug==2.0.2
 
-notifications-python-client==6.0.2
+notifications-python-client==6.3.0
 
 # PaaS
 awscli-cwlogs==1.4.6

requirements.txt

@@ -6,7 +6,7 @@
 #
 alembic==1.7.4
     # via flask-migrate
-amqp==5.0.6
+amqp==5.0.9
     # via kombu
 attrs==21.2.0
     # via jsonschema
@@ -37,7 +37,7 @@ cachetools==4.2.1
     # via
     #   -r requirements.in
     #   notifications-utils
-celery[sqs]==5.2.0
+celery[sqs]==5.2.3
     # via -r requirements.in
 certifi==2021.10.8
     # via
@@ -88,7 +88,7 @@ flask-bcrypt==0.7.1
     # via -r requirements.in
 flask-marshmallow==0.14.0
     # via -r requirements.in
-flask-migrate==2.7.0
+flask-migrate==3.1.0
     # via -r requirements.in
 flask-redis==0.4.0
     # via notifications-utils
@@ -110,7 +110,7 @@ gunicorn @ git+https://github.com/benoitc/gunicorn.git@1299ea9e967a61ae2edebe191
     # via -r requirements.in
 idna==3.3
     # via requests
-iso8601==0.1.14
+iso8601==1.0.2
     # via -r requirements.in
 itsdangerous==1.1.0
     # via
@@ -127,9 +127,9 @@ jmespath==0.10.0
     #   botocore
 jsonschema==3.2.0
     # via -r requirements.in
-kombu==5.2.1
+kombu==5.2.3
     # via celery
-lxml==4.7.1
+lxml==4.8.0
     # via -r requirements.in
 mako==1.1.5
     # via alembic
@@ -146,7 +146,7 @@ marshmallow-sqlalchemy==0.23.1
     # via -r requirements.in
 mistune==0.8.4
     # via notifications-utils
-notifications-python-client==6.0.2
+notifications-python-client==6.3.0
     # via -r requirements.in
 notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@53.0.0
     # via -r requirements.in
@@ -162,7 +162,7 @@ prometheus-client==0.10.1
     #   gds-metrics
 prompt-toolkit==3.0.21
     # via click-repl
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.3
     # via -r requirements.in
 pyasn1==0.4.8
     # via rsa

requirements_for_test.txt

@@ -1,14 +1,14 @@
 -r requirements.txt
-flake8==3.8.4
-flake8-bugbear==20.11.1
-isort==5.7.0
-moto==2.0.11
-pytest==6.1.2
+flake8==4.0.1
+flake8-bugbear==22.1.11
+isort==5.10.1
+moto==3.0.5
+pytest==7.0.1
 pytest-env==0.6.2
-pytest-mock==3.3.1
-pytest-cov==2.10.1
-pytest-xdist==2.1.0
+pytest-mock==3.7.0
+pytest-cov==3.0.0
+pytest-xdist==2.5.0
 freezegun==1.1.0
-requests-mock==1.8.0
+requests-mock==1.9.3
 # used for creating manifest file locally
-jinja2-cli[yaml]==0.7.0
+jinja2-cli[yaml]==0.8.1