Skip to content

Commit e49d8f9

Browse files
authored
Merge branch 'main' into fix-field-serializer-with-computed-field
2 parents 8590913 + 0e6b377 commit e49d8f9

File tree

5 files changed

+34
-49
lines changed

5 files changed

+34
-49
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pydantic-core"
3-
version = "2.20.0"
3+
version = "2.20.1"
44
edition = "2021"
55
license = "MIT"
66
homepage = "https://github.com/pydantic/pydantic-core"
@@ -31,12 +31,12 @@ rust-version = "1.75"
3131
# but needs a bit of work to make sure it's not used in the codebase
3232
pyo3 = { version = "0.22.0", features = ["generate-import-lib", "num-bigint", "py-clone"] }
3333
regex = "1.10.4"
34-
strum = { version = "0.25.0", features = ["derive"] }
35-
strum_macros = "0.26.1"
34+
strum = { version = "0.26.3", features = ["derive"] }
35+
strum_macros = "0.26.4"
3636
serde_json = {version = "1.0.116", features = ["arbitrary_precision", "preserve_order"]}
3737
enum_dispatch = "0.3.13"
3838
serde = { version = "1.0.203", features = ["derive"] }
39-
speedate = "0.14.0"
39+
speedate = "0.14.4"
4040
smallvec = "1.13.2"
4141
ahash = "0.8.10"
4242
url = "2.5.0"

tests/requirements-linting.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
griffe==0.45.2
2-
pyright==1.1.365
1+
griffe==0.47.0
2+
pyright==1.1.369
33
ruff==0.5.0
4-
mypy==1.10.0
4+
mypy==1.10.1

tests/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
backports.zoneinfo==0.2.1;python_version<"3.9"
2-
coverage==7.5.3
2+
coverage==7.5.4
33
dirty-equals==0.7.1.post0
4-
hypothesis==6.103.0
4+
hypothesis==6.104.2
55
# pandas doesn't offer prebuilt wheels for all versions and platforms we test in CI e.g. aarch64 musllinux
66
pandas==2.1.3; python_version >= "3.9" and python_version < "3.13" and implementation_name == "cpython" and platform_machine == 'x86_64'
7-
pytest==8.2.1
7+
pytest==8.2.2
88
# we run codspeed benchmarks on x86_64 CPython (i.e. native github actions architecture)
99
pytest-codspeed~=2.2.1; implementation_name == "cpython" and platform_machine == 'x86_64'
1010
# pytest-examples currently depends on aiohttp via black; we don't want to build
1111
# it on platforms like aarch64 musllinux in CI
12-
pytest-examples==0.0.11; implementation_name == "cpython" and platform_machine == 'x86_64'
12+
pytest-examples==0.0.12; implementation_name == "cpython" and platform_machine == 'x86_64'
1313
pytest-speed==0.3.5
1414
pytest-mock==3.14.0
1515
pytest-pretty==1.2.0

tests/validators/test_timedelta.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,16 @@ def test_timedelta_kwargs_strict():
195195

196196

197197
def test_invalid_constraint():
198-
with pytest.raises(SchemaError, match='timedelta.gt\n Input should be a valid timedelta, invalid digit in'):
198+
with pytest.raises(
199+
SchemaError,
200+
match='Invalid Schema:\ntimedelta.gt\n Input should be a valid timedelta, invalid character in hour',
201+
):
199202
validate_core_schema({'type': 'timedelta', 'gt': 'foobar'})
200203

201-
with pytest.raises(SchemaError, match='timedelta.le\n Input should be a valid timedelta, invalid digit in'):
204+
with pytest.raises(
205+
SchemaError,
206+
match='Invalid Schema:\ntimedelta.le\n Input should be a valid timedelta, invalid character in hour',
207+
):
202208
validate_core_schema({'type': 'timedelta', 'le': 'foobar'})
203209

204210

0 commit comments

Comments
 (0)