Skip to content

Commit 907ed67

Browse files
authored
Merge branch 'main' into fix-12273-dict
2 parents a8ffe29 + 13a34ef commit 907ed67

File tree

17 files changed

+695
-251
lines changed

17 files changed

+695
-251
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121

2222
# rust-nightly used for `#[coverage(off)]`
2323
- uses: dtolnay/rust-toolchain@nightly
@@ -81,7 +81,7 @@ jobs:
8181
continue-on-error: ${{ endsWith(matrix.python-version, 't') }}
8282

8383
steps:
84-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v5
8585

8686
- name: install rust stable
8787
uses: dtolnay/rust-toolchain@stable
@@ -121,7 +121,7 @@ jobs:
121121

122122
runs-on: ${{ matrix.os }}-latest
123123
steps:
124-
- uses: actions/checkout@v4
124+
- uses: actions/checkout@v5
125125

126126
- name: install rust stable
127127
uses: dtolnay/rust-toolchain@stable
@@ -150,7 +150,7 @@ jobs:
150150

151151
runs-on: ubuntu-latest
152152
steps:
153-
- uses: actions/checkout@v4
153+
- uses: actions/checkout@v5
154154

155155
- name: install uv
156156
uses: astral-sh/setup-uv@v6
@@ -193,7 +193,7 @@ jobs:
193193
- 'pypy3.10'
194194

195195
steps:
196-
- uses: actions/checkout@v4
196+
- uses: actions/checkout@v5
197197

198198
- name: install uv
199199
uses: astral-sh/setup-uv@v6
@@ -219,12 +219,12 @@ jobs:
219219
continue-on-error: true
220220

221221
steps:
222-
- uses: actions/checkout@v4
222+
- uses: actions/checkout@v5
223223
with:
224224
repository: pydantic/pydantic
225225
path: pydantic
226226

227-
- uses: actions/checkout@v4
227+
- uses: actions/checkout@v5
228228
with:
229229
path: pydantic-core
230230

@@ -261,7 +261,7 @@ jobs:
261261
runs-on: ubuntu-latest
262262

263263
steps:
264-
- uses: actions/checkout@v4
264+
- uses: actions/checkout@v5
265265

266266
- name: install rust stable
267267
uses: dtolnay/rust-toolchain@stable
@@ -272,7 +272,7 @@ jobs:
272272
uses: Swatinem/rust-cache@v2
273273

274274
# used to lint js code
275-
- uses: actions/setup-node@v4
275+
- uses: actions/setup-node@v5
276276
with:
277277
node-version: '18'
278278

@@ -296,15 +296,15 @@ jobs:
296296
runs-on: ubuntu-latest
297297

298298
steps:
299-
- uses: actions/checkout@v4
299+
- uses: actions/checkout@v5
300300

301301
- name: install rust nightly
302302
uses: dtolnay/rust-toolchain@nightly
303303

304304
- name: cache rust
305305
uses: Swatinem/rust-cache@v2
306306

307-
- uses: actions/setup-python@v5
307+
- uses: actions/setup-python@v6
308308
with:
309309
python-version: '3.13'
310310

@@ -315,7 +315,7 @@ jobs:
315315
build-wasm-emscripten:
316316
runs-on: ubuntu-latest
317317
steps:
318-
- uses: actions/checkout@v4
318+
- uses: actions/checkout@v5
319319

320320
- name: install rust nightly
321321
uses: dtolnay/rust-toolchain@master
@@ -345,7 +345,7 @@ jobs:
345345
- name: build wheels
346346
run: make build-wasm
347347

348-
- uses: actions/setup-node@v4
348+
- uses: actions/setup-node@v5
349349
with:
350350
node-version: '18'
351351

@@ -378,8 +378,8 @@ jobs:
378378
name: build sdist
379379
runs-on: ubuntu-latest
380380
steps:
381-
- uses: actions/checkout@v4
382-
- uses: actions/setup-python@v5
381+
- uses: actions/checkout@v5
382+
- uses: actions/setup-python@v6
383383
with:
384384
python-version: '3.13'
385385
- uses: PyO3/maturin-action@v1
@@ -475,10 +475,10 @@ jobs:
475475

476476
runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
477477
steps:
478-
- uses: actions/checkout@v4
478+
- uses: actions/checkout@v5
479479

480480
- name: set up python
481-
uses: actions/setup-python@v5
481+
uses: actions/setup-python@v6
482482
with:
483483
python-version: '3.13'
484484
architecture: ${{ matrix.python-architecture || 'x64' }}
@@ -528,7 +528,7 @@ jobs:
528528

529529
runs-on: ${{ matrix.runs-on }}
530530
steps:
531-
- uses: actions/checkout@v4
531+
- uses: actions/checkout@v5
532532

533533
- name: install uv
534534
uses: astral-sh/setup-uv@v6
@@ -561,10 +561,10 @@ jobs:
561561
runs-on: ubuntu-latest
562562

563563
steps:
564-
- uses: actions/checkout@v4
564+
- uses: actions/checkout@v5
565565

566566
- name: get dist artifacts
567-
uses: actions/download-artifact@v4
567+
uses: actions/download-artifact@v5
568568
with:
569569
pattern: pypi_files_*
570570
merge-multiple: true
@@ -602,10 +602,10 @@ jobs:
602602
distro: alpine_latest
603603

604604
steps:
605-
- uses: actions/checkout@v4
605+
- uses: actions/checkout@v5
606606

607607
- name: get dist artifacts
608-
uses: actions/download-artifact@v4
608+
uses: actions/download-artifact@v5
609609
with:
610610
pattern: pypi_files_linux_*
611611
merge-multiple: true
@@ -650,13 +650,13 @@ jobs:
650650

651651
runs-on: ${{ matrix.os }}-latest
652652
steps:
653-
- uses: actions/checkout@v4
653+
- uses: actions/checkout@v5
654654

655655
- name: install uv
656656
uses: astral-sh/setup-uv@v6
657657

658658
- name: get dist artifacts
659-
uses: actions/download-artifact@v4
659+
uses: actions/download-artifact@v5
660660
with:
661661
pattern: pypi_files_*
662662
merge-multiple: true
@@ -679,15 +679,15 @@ jobs:
679679
contents: write
680680

681681
steps:
682-
- uses: actions/checkout@v4
682+
- uses: actions/checkout@v5
683683

684684
- uses: astral-sh/setup-uv@v6
685685

686686
- name: check package version
687687
run: uv run .github/check_version.py
688688

689689
- name: get dist artifacts
690-
uses: actions/download-artifact@v4
690+
uses: actions/download-artifact@v5
691691
with:
692692
pattern: pypi_files_*
693693
merge-multiple: true
@@ -696,7 +696,7 @@ jobs:
696696
- run: uv publish --trusted-publishing always
697697

698698
- name: get wasm dist artifacts
699-
uses: actions/download-artifact@v4
699+
uses: actions/download-artifact@v5
700700
with:
701701
name: wasm_wheels
702702
path: wasm

.github/workflows/codspeed.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
runs-on: ubuntu-22.04
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
# Using this action is still necessary for CodSpeed to work:
24-
- uses: actions/setup-python@v5
24+
- uses: actions/setup-python@v6
2525
with:
2626
python-version: ${{ env.UV_PYTHON}}
2727

@@ -60,6 +60,7 @@ jobs:
6060
run: uv pip install ${{ steps.pgo-wheel.outputs.wheel }} --force-reinstall
6161

6262
- name: Run CodSpeed benchmarks
63-
uses: CodSpeedHQ/action@v3
63+
uses: CodSpeedHQ/action@v4
6464
with:
65+
mode: instrumentation
6566
run: uv run --group=codspeed pytest tests/benchmarks/ --codspeed

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pydantic-core"
3-
version = "2.39.0"
3+
version = "2.40.0"
44
edition = "2021"
55
license = "MIT"
66
homepage = "https://github.com/pydantic/pydantic-core"
@@ -28,22 +28,22 @@ rust-version = "1.75"
2828
# TODO it would be very nice to remove the "py-clone" feature as it can panic,
2929
# but needs a bit of work to make sure it's not used in the codebase
3030
pyo3 = { version = "0.26", features = ["generate-import-lib", "num-bigint", "py-clone"] }
31-
regex = "1.11.1"
31+
regex = "1.11.3"
3232
strum = { version = "0.27", features = ["derive"] }
3333
strum_macros = "0.27"
34-
serde_json = { version = "1.0.142", features = ["arbitrary_precision"] }
34+
serde_json = { version = "1.0.145", features = ["arbitrary_precision"] }
3535
enum_dispatch = "0.3.13"
3636
serde = { version = "1.0.219", features = ["derive"] }
3737
speedate = "0.17.0"
3838
smallvec = "1.15.1"
3939
ahash = "0.8.12"
4040
url = "2.5.4"
4141
# idna is already required by url, added here to be explicit
42-
idna = "1.0.3"
42+
idna = "1.1.0"
4343
base64 = "0.22.1"
4444
num-bigint = "0.4.6"
4545
num-traits = "0.2.19"
46-
uuid = "1.17.0"
46+
uuid = "1.18.1"
4747
jiter = { version = "0.11.0", features = ["python"] }
4848
hex = "0.4.3"
4949

0 commit comments

Comments
 (0)