From 807db037ebe08b04166d071696cb5f57c30c99e2 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 2 Mar 2022 15:52:18 +0000 Subject: [PATCH 1/9] Update flake8 from 3.8.4 to 4.0.1 And adds `noqa` to some non-errors which are being flagged. --- app/dao/services_dao.py | 12 ++++++------ app/dao/uploads_dao.py | 2 +- requirements_for_test.txt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index b9de79859..58ae9ea3d 100644 --- a/app/dao/services_dao.py +++ b/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 diff --git a/app/dao/uploads_dao.py b/app/dao/uploads_dao.py index cb04617a9..29fa25fb8 100644 --- a/app/dao/uploads_dao.py +++ b/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: diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 36464b7b7..56e180c0e 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -1,5 +1,5 @@ -r requirements.txt -flake8==3.8.4 +flake8==4.0.1 flake8-bugbear==20.11.1 isort==5.7.0 moto==2.0.11 From 514bd486144ac737f6cd084321cac9237ffca8c4 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 2 Mar 2022 16:51:09 +0000 Subject: [PATCH 2/9] Update flake8-bugbear from 20.11.1 to 22.1.11 And ignore a warning, since I did not think that in this case "Using .strip() with multi-character strings is misleading the reader". --- app/celery/nightly_tasks.py | 2 +- requirements_for_test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/celery/nightly_tasks.py b/app/celery/nightly_tasks.py index 54edbe889..bcca9818e 100644 --- a/app/celery/nightly_tasks.py +++ b/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." diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 56e180c0e..471c1b2ad 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -1,6 +1,6 @@ -r requirements.txt flake8==4.0.1 -flake8-bugbear==20.11.1 +flake8-bugbear==22.1.11 isort==5.7.0 moto==2.0.11 pytest==6.1.2 From a8ed76d4a7b2709440ad5b7f7e7292bc7c665e2e Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 2 Mar 2022 17:18:32 +0000 Subject: [PATCH 3/9] Bump all test dependencies which require no code changes --- requirements_for_test.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 471c1b2ad..901f32239 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -1,14 +1,14 @@ -r requirements.txt flake8==4.0.1 flake8-bugbear==22.1.11 -isort==5.7.0 -moto==2.0.11 -pytest==6.1.2 +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 From c1a3b4bc2438216e8d3eda58d15315294e4c0be8 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 3 Mar 2022 13:42:10 +0000 Subject: [PATCH 4/9] Update celery from 5.2.0 to 5.2.3 This fixes a security warning. --- requirements.in | 2 +- requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.in b/requirements.in index 51a0d3101..0e6a32eea 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ # 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 diff --git a/requirements.txt b/requirements.txt index 125862e93..9a36524f1 100644 --- a/requirements.txt +++ b/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 @@ -127,7 +127,7 @@ 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 # via -r requirements.in From f74d878a0787ff105b7dbdb0b7f48a834098f390 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 3 Mar 2022 13:44:19 +0000 Subject: [PATCH 5/9] Update flask-migrate from 2.7.0 to 3.1.0 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 0e6a32eea..b40e19b16 100644 --- a/requirements.in +++ b/requirements.in @@ -5,7 +5,7 @@ cffi==1.15.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 diff --git a/requirements.txt b/requirements.txt index 9a36524f1..cf809d69f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From 9e324da311cfc796d13093791750ac643617d58f Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 3 Mar 2022 13:47:47 +0000 Subject: [PATCH 6/9] Update iso8601 from 0.1.14 to 1.0.2 The major version bump is because support for Python 3.6 has been dropped. --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index b40e19b16..3e83f119e 100644 --- a/requirements.in +++ b/requirements.in @@ -11,7 +11,7 @@ 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 diff --git a/requirements.txt b/requirements.txt index cf809d69f..f64fa0fa3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From 3a57597266b5b4a5d3d00f87f8ac99ba8a339c62 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 3 Mar 2022 14:07:11 +0000 Subject: [PATCH 7/9] Update psycopg2-binary from 2.8.6 to 2.9.3 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 3e83f119e..8b8ae567b 100644 --- a/requirements.in +++ b/requirements.in @@ -16,7 +16,7 @@ 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 diff --git a/requirements.txt b/requirements.txt index f64fa0fa3..a1c5a0c76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From 7943010bfb130ed4ffa18a80a365a3bd84737cc6 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 3 Mar 2022 14:15:16 +0000 Subject: [PATCH 8/9] Update lxml from 4.7.1 to 4.8.0 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 8b8ae567b..3713a9170 100644 --- a/requirements.in +++ b/requirements.in @@ -23,7 +23,7 @@ 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 diff --git a/requirements.txt b/requirements.txt index a1c5a0c76..dd91f88af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -129,7 +129,7 @@ jsonschema==3.2.0 # via -r requirements.in kombu==5.2.3 # via celery -lxml==4.7.1 +lxml==4.8.0 # via -r requirements.in mako==1.1.5 # via alembic From faec6083faf9b20c978e9eb9e460f7582856aeeb Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 3 Mar 2022 14:17:32 +0000 Subject: [PATCH 9/9] Update notifications-python-client from 6.0.2 to 6.3.0 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 3713a9170..44f7d7c89 100644 --- a/requirements.in +++ b/requirements.in @@ -26,7 +26,7 @@ beautifulsoup4==4.9.3 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 diff --git a/requirements.txt b/requirements.txt index dd91f88af..881b6984a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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