Merge pull request #188 from NHSDigital/mesh-2092-dependabot-combined

MESH-2092 Combined Dependabot PRs

Author: jimasp

.github/workflows/merge-develop.yml

@@ -5,7 +5,6 @@ on:
       - develop
 
 jobs:
-
   coverage:
     runs-on: ubuntu-latest
     if: github.repository == 'NHSDigital/nhs-aws-helpers' && !contains(github.event.head_commit.message, 'tag release version:')
@@ -16,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: "pyproject.toml"
 
@@ -92,7 +91,6 @@ jobs:
         if: success() || failure()
         run: make down
 
-
   publish:
     runs-on: ubuntu-latest
     if: github.repository == 'NHSDigital/nhs-aws-helpers' && github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
@@ -108,7 +106,7 @@ jobs:
           find . -type f | xargs chmod g+w
 
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: "pyproject.toml"
 
@@ -165,4 +163,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./dist/${{ env.SDIST }}
           asset_name: ${{ env.SDIST }}
-          asset_content_type: application/gzip
+          asset_content_type: application/gzip

.github/workflows/pull-request.yml

@@ -46,7 +46,7 @@ jobs:
           PR_BRANCH: ${{ github.head_ref }}
 
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -100,7 +100,7 @@ jobs:
           PR_BRANCH: ${{ github.head_ref }}
 
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: "pyproject.toml"
 
@@ -220,7 +220,7 @@ jobs:
           PR_BRANCH: ${{ github.head_ref }}
 
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: "pyproject.toml"
 
@@ -307,7 +307,7 @@ jobs:
           PR_BRANCH: ${{ github.head_ref }}
 
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: "pyproject.toml"