Skip to content

Commit 078312f

Browse files
Merge branch 'mesh-2769-support-python-314' of github.com:NHSDigital/nhs-aws-helpers into mesh-2092-dependabot-combined
2 parents 9667856 + 9f6fd17 commit 078312f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

nhs_aws_helpers/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def optional_origin_type(original_type: type) -> type:
4242
"""
4343
if the target type is Optional or a Union[xxx, None] this will return the wrapped type
4444
"""
45-
if original_type.__class__.__name__ not in ("_UnionGenericAlias", "UnionType", "_GenericAlias"):
45+
if original_type.__class__.__name__ not in ("_UnionGenericAlias", "UnionType", "_GenericAlias", "Union"):
4646
return original_type
4747
args = typing.get_args(original_type)
4848
if len(args) != 2:

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ check_untyped_defs = true
146146
[tool.tox]
147147
legacy_tox_ini = """
148148
[tox]
149-
envlist = py39,py310,py311,py312,py313
149+
envlist = py39,py310,py311,py312,py313,py314
150150
151151
[gh-actions]
152152
python =
@@ -155,6 +155,7 @@ python =
155155
3.11: py311
156156
3.12: py312
157157
3.13: py313
158+
3.14: py314
158159
159160
[testenv]
160161
deps =
@@ -173,7 +174,7 @@ commands =
173174

174175

175176
[tool.poetry-dynamic-versioning]
176-
enable = true
177+
enable = false
177178
metadata = false
178179
vcs = "git"
179180
style = "pep440"

0 commit comments

Comments
 (0)