From 9f6fd174b9cadd9a1099514acd13d9eabb995ab6 Mon Sep 17 00:00:00 2001
From: James <james.bradley7@nhs.net>
Date: Wed, 24 Dec 2025 10:20:03 +0000
Subject: [PATCH 1/2] mesh-2796: support python 3.14

---
 .tool-versions            | 2 +-
 nhs_aws_helpers/common.py | 2 +-
 pyproject.toml            | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 7139565..fe62b5c 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 poetry 2.1.4
-python 3.13.5 3.12.11 3.11.13 3.10.18 3.9.23
+python 3.14.2 3.13.5 3.12.11 3.11.13 3.10.18 3.9.23
diff --git a/nhs_aws_helpers/common.py b/nhs_aws_helpers/common.py
index aff7d4b..4fb20d3 100644
--- a/nhs_aws_helpers/common.py
+++ b/nhs_aws_helpers/common.py
@@ -42,7 +42,7 @@ def optional_origin_type(original_type: type) -> type:
     """
     if the target type is Optional or a Union[xxx, None] this will return the wrapped type
     """
-    if original_type.__class__.__name__ not in ("_UnionGenericAlias", "UnionType", "_GenericAlias"):
+    if original_type.__class__.__name__ not in ("_UnionGenericAlias", "UnionType", "_GenericAlias", "Union"):
         return original_type
     args = typing.get_args(original_type)
     if len(args) != 2:
diff --git a/pyproject.toml b/pyproject.toml
index a154d64..dfecc5c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -139,7 +139,7 @@ check_untyped_defs = true
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py39,py310,py311,py312,py313
+envlist = py39,py310,py311,py312,py313,py314
 
 [gh-actions]
 python =
@@ -148,6 +148,7 @@ python =
     3.11: py311
     3.12: py312
     3.13: py313
+    3.14: py314
 
 [testenv]
 deps =
@@ -166,7 +167,7 @@ commands =
 
 
 [tool.poetry-dynamic-versioning]
-enable = true
+enable = false
 metadata = false
 vcs = "git"
 style = "pep440"

From a1dc58a5747b1f1777fe6c03258a621a5a434c18 Mon Sep 17 00:00:00 2001
From: James <james.bradley7@nhs.net>
Date: Wed, 24 Dec 2025 11:09:54 +0000
Subject: [PATCH 2/2] mesh-2769: re-enable dynamic versioning

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index dfecc5c..9b9a9d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -167,7 +167,7 @@ commands =
 
 
 [tool.poetry-dynamic-versioning]
-enable = false
+enable = true
 metadata = false
 vcs = "git"
 style = "pep440"