Skip to content

Commit 628301b

Browse files
Merge branch 'release_v08' of https://github.com/NHSDigital/data-validation-engine into build/pyspark_35
2 parents 45dcc9a + 22ad813 commit 628301b

4 files changed

Lines changed: 92 additions & 101 deletions

File tree

poetry.lock

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

pyproject.toml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ packages = [
3030
]
3131

3232
[tool.poetry.dependencies]
33-
python = ">=3.10,<3.13"
33+
python = ">=3.10,<3.13" # breaking changes beyond 3.12
3434
boto3 = ">=1.34.162,<1.36" # breaking change beyond 1.36
3535
botocore = ">=1.34.162,<1.36" # breaking change beyond 1.36
3636
delta-spark = "3.2.0"
37-
duckdb = "1.1.*" # breaking changes beyond 1.1
38-
Jinja2 = "3.1.*"
39-
lxml = "^4.9.1"
37+
duckdb = "1.1.3" # breaking changes beyond 1.1
38+
Jinja2 = "3.1.6"
39+
lxml = "4.9.4"
4040
numpy = "1.26.4"
41-
openpyxl = "^3.1"
42-
pandas = "^2.2.2"
43-
polars = "0.20.*"
44-
pyarrow = "^17.0.0"
41+
openpyxl = "3.1.5"
42+
pandas = "2.3.3"
43+
polars = "0.20.31"
44+
pyarrow = "17.0.0"
4545
pydantic = "1.10.19"
4646
pyspark = "3.5.2"
47-
typing_extensions = "^4.6.2"
47+
typing_extensions = "4.15.0"
4848

4949
[tool.poetry.group.dev]
5050
optional = true
@@ -58,30 +58,29 @@ commitizen = "4.9.1"
5858
pre-commit = "4.3.0"
5959
charset-normalizer = "3.4.6"
6060
python-discovery = "1.2.0"
61-
requests = "2.33.0"
6261

6362
[tool.poetry.group.test]
6463
optional = true
6564

6665
[tool.poetry.group.test.dependencies]
67-
faker = "18.11.1"
6866
behave = "1.3.3"
6967
coverage = "7.11.0"
70-
moto = {extras = ["s3"], version = "4.0.13"}
68+
moto = {extras = ["s3"], version = "4.2.14"}
69+
requests = "2.33.0" # dependency of `moto`
7170
Werkzeug = "3.1.6"
7271
pytest = "8.4.2"
7372
pytest-lazy-fixtures = "1.4.0" # switched from https://github.com/TvoroG/pytest-lazy-fixture as it's no longer supported
74-
xlsx2csv = "0.8.2"
73+
xlsx2csv = "0.8.4" # polars requirement
7574

7675
[tool.poetry.group.lint]
7776
optional = true
7877

7978
[tool.poetry.group.lint.dependencies]
8079
black = "24.3.0"
8180
astroid = "3.3.9"
82-
isort = "5.11.5"
81+
isort = "5.13.2"
8382
pylint = "3.3.9"
84-
mypy = "0.991"
83+
mypy = "1.11.2"
8584
boto3-stubs = {extras = ["essential"], version = "1.26.72"}
8685
botocore-stubs = "1.29.72"
8786
pandas-stubs = "1.2.0.62"
@@ -100,7 +99,7 @@ optional = true
10099

101100
[tool.poetry.group.docs.dependencies]
102101
click = "8.2.1"
103-
mkdocs = "^1.6.1"
102+
mkdocs = "1.6.1"
104103
mkdocstrings = { version = "1.0.3", extras = ["python"] }
105104
griffelib = "2.0.1"
106105
pymdown-extensions = "10.21.2"

src/dve/core_engine/backends/utilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def stringify_type(type_: Union[type, GenericAlias]) -> type:
5252

5353
origin = get_origin(type_)
5454
if origin is None: # A non-generic container type, return as-is
55-
return type_
55+
return type_ # type: ignore
5656

5757
type_args = get_args(type_)
5858
if not type_args:

0 commit comments

Comments
 (0)