MESH-2092 remove python 3.7 and 3.8 as EOL, added 3.12 and 3.13 into the mix and fix endpoint tests following Spine's migrations

Author: davidhallam4-nhs

.github/workflows/merge-develop.yml

@@ -18,12 +18,12 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version-file: 'pyproject.toml'
 
       - name: setup poetry
         uses: abatilo/actions-poetry@v3
         with:
-          poetry-version: 1.8.3
+          poetry-version: 2.1.3
 
       - name: add poetry plugins
         run: |
@@ -34,7 +34,7 @@ jobs:
         with:
           path: |
             .venv
-          key: ${{ runner.os }}-v3-poetry-py3.8-${{ hashFiles('./poetry.lock') }}
+          key: ${{ runner.os }}-v3-poetry-py3.9-${{ hashFiles('./poetry.lock') }}
 
       - name: git reset
         run: git reset --hard

.github/workflows/merge-release.yml

@@ -23,12 +23,12 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version-file: 'pyproject.toml'
 
       - name: setup poetry
         uses: abatilo/actions-poetry@v3
         with:
-          poetry-version: 1.8.3
+          poetry-version: 2.1.3
 
       - name: add poetry plugins
         run: |

.github/workflows/pull-request.yml

@@ -9,7 +9,7 @@ jobs:
   tox:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     runs-on: ubuntu-latest
     if: github.repository == 'NHSDigital/mesh-client'
@@ -95,12 +95,12 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version-file: 'pyproject.toml'
 
       - name: setup poetry
         uses: abatilo/actions-poetry@v3
         with:
-          poetry-version: 1.8.3
+          poetry-version: 2.1.3
 
       - name: add poetry plugins
         run: |
@@ -111,7 +111,7 @@ jobs:
         with:
           path: |
             .venv
-          key: ${{ runner.os }}-v3-poetry-py3.8-${{ hashFiles('./poetry.lock') }}
+          key: ${{ runner.os }}-v3-poetry-py3.9-${{ hashFiles('./poetry.lock') }}
 
       - name: git reset
         run: git reset --hard
@@ -213,12 +213,12 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version-file: 'pyproject.toml'
 
       - name: setup poetry
         uses: abatilo/actions-poetry@v3
         with:
-          poetry-version: 1.8.3
+          poetry-version: 2.1.3
 
       - name: add poetry plugins
         run: |
@@ -229,7 +229,7 @@ jobs:
         with:
           path: |
             .venv
-          key: ${{ runner.os }}-v3-poetry-py3.8-${{ hashFiles('./poetry.lock') }}
+          key: ${{ runner.os }}-v3-poetry-py3.9-${{ hashFiles('./poetry.lock') }}
 
       - name: git reset
         run: git reset --hard
@@ -298,12 +298,12 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version-file: 'pyproject.toml'
 
       - name: setup poetry
         uses: abatilo/actions-poetry@v3
         with:
-          poetry-version: 1.8.3
+          poetry-version: 2.1.3
 
       - name: add poetry plugins
         run: |

.tool-versions

@@ -1,2 +1,2 @@
-poetry 1.8.3
-python 3.10.12 3.9.13 3.7.12 3.8.14 3.11.4
+poetry 2.1.3
+python 3.10.18 3.9.23 3.11.13 3.12.11 3.13.5

CONTRIBUTING.md

@@ -102,12 +102,4 @@ You can check for secrets / test patterns at any time though with
 
 ```shell
 make check-secrets-all
-```
-
-## Supporting multiple versions of dependencies
-
-Currently we still support version python 3.7 for the mesh-client but as some packages now have vulnerabilities that are only fixed in higher versions of python we must support multiple versions of the packages. As we use setuptools we have a defined way of doing this in `setup.py` which means packages in the `pyproject.toml` for multiple versions should be defined as a list of dictionaries with the keys of `version` and `markers` as so:
-
-```toml
-requests = [{version = ">=2.26.0", markers = "python_version<'3.8'"},{version = ">=2.32.0", markers = "python_version>='3.8'"}]
-```
+```

Makefile

@@ -49,10 +49,10 @@ delete-hooks:
 refresh-hooks: delete-hooks .git/hooks/pre-commit .git/hooks/commit-msg
 
 install:
-	poetry install --sync
+	poetry sync
 
 install-ci:
-	poetry install --without local --sync
+	poetry sync --without local
 
 update:
 	poetry update

README.md

@@ -1,7 +1,7 @@
 MESH Client
 ===========
 
-A Python client for [NHS Digital's MESH API](https://digital.nhs.uk/developer/api-catalogue/message-exchange-for-social-care-and-health-api).
+A Python client for [NHS England's MESH API](https://digital.nhs.uk/developer/api-catalogue/message-exchange-for-social-care-and-health-api).
 
 Release Notes
 ------------

SECURITY.md

@@ -1,6 +1,6 @@
 # Security
 
-NHS Digital takes security and the protection of private data extremely
+NHS England takes security and the protection of private data extremely
 seriously. If you believe you have found a vulnerability or other issue which
 has compromised or could compromise the security of any of our systems and/or
 private data managed by our systems, please do not hesitate to contact us using
@@ -25,7 +25,7 @@ Programme, you can report directly to us at: https://hackerone.com/nhs
 
 ### NCSC
 You can send your report to the National Cyber Security Centre, who will assess
-your report and pass it on to NHS Digital if necessary.
+your report and pass it on to NHS England if necessary.
 
 You can report vulnerabilities here:
 https://www.ncsc.gov.uk/information/vulnerability-reporting

docker-compose.yml

@@ -4,7 +4,7 @@ services:
 
   mesh_sandbox:
     build:
-      context: https://github.com/NHSDigital/mesh-sandbox.git#refs/tags/v1.0.13
+      context: https://github.com/NHSDigital/mesh-sandbox.git#refs/tags/v1.0.27
     ports:
       - "8701:443"
     deploy:

mesh_client/__init__.py

@@ -10,12 +10,13 @@
 import sys
 import uuid
 import warnings
+from collections.abc import Generator
 from dataclasses import dataclass
 from hashlib import sha256
 from io import BytesIO
 from itertools import chain
 from types import TracebackType
-from typing import Any, Dict, Generator, List, NoReturn, Optional, Tuple, Type, TypeVar, Union, cast
+from typing import Any, Dict, List, NoReturn, Optional, Tuple, Type, TypeVar, Union, cast
 from urllib.parse import quote as q
 from urllib.parse import urlparse