Skip to content

Commit a3410d1

Browse files
Merge pull request #198 from NHSDigital/mesh-2092-dependabot-combined
MESH-2092 Combined Dependabot PRs
2 parents 4b0dd95 + 495b657 commit a3410d1

8 files changed

Lines changed: 242 additions & 181 deletions

File tree

.gitallowed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ tests/integration/send_message_test.py:[0-9]+:\s*url=_SANDBOX_URL, mailbox=mailb
3030
tests/integration/send_message_test.py:[0-9]+:\s*url=_SANDBOX_URL, mailbox=mailboxes\[1\], password="password", verify=False
3131
tests/integration/conftest.py:[0-9]+:\s*password="password"
3232
poetry.lock:.*asttokens = ">=2.1.0"
33+
poetry.lock:.*:pytokens = ".*"

.github/workflows/merge-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: publish junit reports
3535
if: success() || failure()
36-
uses: mikepenz/action-junit-report@5b7ee5a21e8674b695313d769f3cbdfd5d4d53a4
36+
uses: mikepenz/action-junit-report@74626db7353a25a20a72816467ebf035f674c5f8
3737
with:
3838
check_name: junit reports
3939
report_paths: reports/junit/*.xml

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636

3737
- name: archive reports
3838
if: github.actor != 'dependabot[bot]' && (success() || failure())
39-
uses: actions/upload-artifact@v4
39+
uses: actions/upload-artifact@v6
4040
with:
4141
name: reports
4242
path: reports/**/*
4343

4444
- name: publish junit reports
4545
if: success() || failure()
46-
uses: mikepenz/action-junit-report@5b7ee5a21e8674b695313d769f3cbdfd5d4d53a4
46+
uses: mikepenz/action-junit-report@74626db7353a25a20a72816467ebf035f674c5f8
4747
with:
4848
check_name: junit reports
4949
report_paths: reports/junit/*.xml

poetry.lock

Lines changed: 228 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ python = "^3.11"
1515
importlib-metadata = "8.0.0"
1616
urllib3 = "^2.6.0"
1717
spine-aws-common = "^0.2.14"
18-
nhs-aws-helpers = "^0.7.7"
18+
nhs-aws-helpers = "^0.8.1"
1919
aws-lambda-powertools = "^2.36.0"
2020
mesh-client = "^3.2.3"
2121
requests = "^2.32.3"
@@ -34,7 +34,7 @@ moto = {extras = ["s3", "ssm", "stepfunctions", "secretsmanager"], version = "^5
3434
boto3-stubs = {extras = ["s3", "ssm", "secretsmanager", "dynamodb", "stepfunctions", "sqs", "lambda", "logs",], version = "^1.34.32"}
3535
ruff = "^0"
3636
petname = "^2.6"
37-
black = "^24"
37+
black = "^26"
3838
tox = "^4.18"
3939

4040
[tool.poetry.group.local.dependencies]

src/requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
aws-lambda-powertools==2.43.1 ; python_version >= "3.11" and python_version < "4.0"
2-
boto3-stubs==1.42.38 ; python_version >= "3.11" and python_version < "4.0"
3-
boto3==1.42.38 ; python_version >= "3.11" and python_version < "4.0"
4-
botocore-stubs==1.42.38 ; python_version >= "3.11" and python_version < "4.0"
5-
botocore==1.42.38 ; python_version >= "3.11" and python_version < "4.0"
2+
boto3-stubs==1.42.42 ; python_version >= "3.11" and python_version < "4.0"
3+
boto3==1.42.42 ; python_version >= "3.11" and python_version < "4.0"
4+
botocore-stubs==1.42.41 ; python_version >= "3.11" and python_version < "4.0"
5+
botocore==1.42.42 ; python_version >= "3.11" and python_version < "4.0"
66
certifi==2026.1.4 ; python_version >= "3.11" and python_version < "4.0"
77
charset-normalizer==3.4.4 ; python_version >= "3.11" and python_version < "4.0"
88
idna==3.11 ; python_version >= "3.11" and python_version < "4.0"
@@ -13,7 +13,7 @@ mypy-boto3-athena==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
1313
mypy-boto3-backup==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
1414
mypy-boto3-ce==1.42.28 ; python_version >= "3.11" and python_version < "4.0"
1515
mypy-boto3-cloudwatch==1.42.7 ; python_version >= "3.11" and python_version < "4.0"
16-
mypy-boto3-dynamodb==1.42.33 ; python_version >= "3.11" and python_version < "4.0"
16+
mypy-boto3-dynamodb==1.42.41 ; python_version >= "3.11" and python_version < "4.0"
1717
mypy-boto3-ecs==1.42.29 ; python_version >= "3.11" and python_version < "4.0"
1818
mypy-boto3-events==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
1919
mypy-boto3-firehose==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
@@ -31,7 +31,7 @@ mypy-boto3-sqs==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
3131
mypy-boto3-ssm==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
3232
mypy-boto3-stepfunctions==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
3333
mypy-boto3-sts==1.42.3 ; python_version >= "3.11" and python_version < "4.0"
34-
nhs-aws-helpers==0.7.38 ; python_version >= "3.11" and python_version < "4.0"
34+
nhs-aws-helpers==0.8.2 ; python_version >= "3.11" and python_version < "4.0"
3535
python-dateutil==2.9.0.post0 ; python_version >= "3.11" and python_version < "4.0"
3636
requests==2.32.5 ; python_version >= "3.11" and python_version < "4.0"
3737
s3transfer==0.16.0 ; python_version >= "3.11" and python_version < "4.0"

tests/mocked/mesh_check_send_parameters_application_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" Testing MeshPollMailbox application """
1+
"""Testing MeshPollMailbox application"""
22

33
import json
44
import sys

tests/mocked/mesh_get_file_from_s3_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" Testing Get File From S3 Function """
1+
"""Testing Get File From S3 Function"""
22

33
from nhs_aws_helpers import s3_resource
44

0 commit comments

Comments
 (0)