From c3829da864ff52b95e7173e150970207f0b7dca8 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 09:07:39 +0100 Subject: [PATCH 1/7] Bump all test dependencies --- requirements_for_test.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 6ba2deb51..0e5caf228 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 +flake8-bugbear==22.3.23 isort==5.10.1 -moto==3.0.7 -pytest==7.0.1 +moto==3.1.4 +pytest==7.1.1 pytest-env==0.6.2 pytest-mock==3.7.0 pytest-cov==3.0.0 pytest-xdist==2.5.0 -freezegun==1.2.0 +freezegun==1.2.1 requests-mock==1.9.3 # used for creating manifest file locally -jinja2-cli[yaml]==0.8.1 +jinja2-cli[yaml]==0.8.2 From 0cd06dba62768863d43a43bb4588add5240c1fcc Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 10:13:30 +0100 Subject: [PATCH 2/7] Update celery[sqs] from 5.2.3 to 5.2.6. --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index aaed230aa..cfe498991 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ # with package version changes made in requirements.in cffi==1.15.0 -celery[sqs]==5.2.3 +celery[sqs]==5.2.6 Flask-Bcrypt==0.7.1 flask-marshmallow==0.14.0 Flask-Migrate==3.1.0 diff --git a/requirements.txt b/requirements.txt index f6ce62028..aecda0ac7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ cachetools==4.2.1 # via # -r requirements.in # notifications-utils -celery[sqs]==5.2.3 +celery[sqs]==5.2.6 # via -r requirements.in certifi==2021.10.8 # via From 1f705f3c29e271a92e3dd27e2e2ce4e603a37c7f Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 10:17:20 +0100 Subject: [PATCH 3/7] Update flask from 2.1.0 to 2.1.1 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index cfe498991..5038b589f 100644 --- a/requirements.in +++ b/requirements.in @@ -7,7 +7,7 @@ Flask-Bcrypt==0.7.1 flask-marshmallow==0.14.0 Flask-Migrate==3.1.0 git+https://github.com/mitsuhiko/flask-sqlalchemy.git@500e732dd1b975a56ab06a46bd1a20a21e682262#egg=Flask-SQLAlchemy==2.3.2.dev20190108 -Flask==2.1.0 +Flask==2.1.1 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 diff --git a/requirements.txt b/requirements.txt index aecda0ac7..b99807b83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -73,7 +73,7 @@ docutils==0.15.2 # via awscli eventlet==0.33.0 # via gunicorn -flask==2.1.0 +flask==2.1.1 # via # -r requirements.in # flask-bcrypt From 667d505b5d186bbe3fb8045df73233f5f717d123 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 13:15:33 +0100 Subject: [PATCH 4/7] Update flask-bcrypt from 0.7.1 to 1.0.1 There's no changelog for this, but I've looked through all the commits and can't see any reason why this needed a major version bump or anything that should cause us issues. --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 5038b589f..b1d00acbd 100644 --- a/requirements.in +++ b/requirements.in @@ -3,7 +3,7 @@ cffi==1.15.0 celery[sqs]==5.2.6 -Flask-Bcrypt==0.7.1 +Flask-Bcrypt==1.0.1 flask-marshmallow==0.14.0 Flask-Migrate==3.1.0 git+https://github.com/mitsuhiko/flask-sqlalchemy.git@500e732dd1b975a56ab06a46bd1a20a21e682262#egg=Flask-SQLAlchemy==2.3.2.dev20190108 diff --git a/requirements.txt b/requirements.txt index b99807b83..48fe96587 100644 --- a/requirements.txt +++ b/requirements.txt @@ -82,7 +82,7 @@ flask==2.1.1 # flask-redis # gds-metrics # notifications-utils -flask-bcrypt==0.7.1 +flask-bcrypt==1.0.1 # via -r requirements.in flask-marshmallow==0.14.0 # via -r requirements.in From 857e7c1ce138823300545ebaec93ce4d55305b27 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 13:39:31 +0100 Subject: [PATCH 5/7] Update prometheus-client from 0.10.1 to 0.14.1 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index b1d00acbd..fa6a8f7a6 100644 --- a/requirements.in +++ b/requirements.in @@ -34,5 +34,5 @@ awscli-cwlogs==1.4.6 notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@55.1.4 # gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains -prometheus-client==0.10.1 +prometheus-client==0.14.1 gds-metrics==0.2.4 diff --git a/requirements.txt b/requirements.txt index 48fe96587..806e87aad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -154,7 +154,7 @@ packaging==21.0 # via bleach phonenumbers==8.12.36 # via notifications-utils -prometheus-client==0.10.1 +prometheus-client==0.14.1 # via # -r requirements.in # gds-metrics From f4a4dd8822d7024eb4a5f4a6e984aad6af2a3102 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 13:46:19 +0100 Subject: [PATCH 6/7] Update sqlalchemy from 1.4.32 to 1.4.35 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index fa6a8f7a6..0f43824bc 100644 --- a/requirements.in +++ b/requirements.in @@ -18,7 +18,7 @@ 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.9.3 PyJWT==2.3.0 -SQLAlchemy==1.4.32 +SQLAlchemy==1.4.35 strict-rfc3339==0.7 rfc3987==1.3.8 cachetools==4.2.1 diff --git a/requirements.txt b/requirements.txt index 806e87aad..1923c5179 100644 --- a/requirements.txt +++ b/requirements.txt @@ -224,7 +224,7 @@ smartypants==2.0.1 # via notifications-utils soupsieve==2.2.1 # via beautifulsoup4 -sqlalchemy==1.4.32 +sqlalchemy==1.4.35 # via # -r requirements.in # alembic From f6f6b81e9145d9221a6d00219d6ada24e3f1d6d4 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 14 Apr 2022 14:17:41 +0100 Subject: [PATCH 7/7] Update cachetools from 4.2.1 to 5.0.0 There are breaking changes in the latest version, but these should not affect our code. --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 0f43824bc..9d4ede6d9 100644 --- a/requirements.in +++ b/requirements.in @@ -21,7 +21,7 @@ PyJWT==2.3.0 SQLAlchemy==1.4.35 strict-rfc3339==0.7 rfc3987==1.3.8 -cachetools==4.2.1 +cachetools==5.0.0 beautifulsoup4==4.10.0 lxml==4.8.0 Werkzeug==2.0.3 diff --git a/requirements.txt b/requirements.txt index 1923c5179..c3c3dd044 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ botocore==1.22.4 # awscli # boto3 # s3transfer -cachetools==4.2.1 +cachetools==5.0.0 # via # -r requirements.in # notifications-utils