Skip to content

Commit 6a4fa06

Browse files
Merge branch 'pydantic:main' into dev-url-join
2 parents 8b70975 + 9b21b0f commit 6a4fa06

26 files changed

+457
-134
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: set up python
3434
uses: actions/setup-python@v5
3535
with:
36-
python-version: '3.11'
36+
python-version: '3.13'
3737

3838
- run: pip install -r tests/requirements.txt
3939

@@ -124,7 +124,7 @@ jobs:
124124
- name: set up python
125125
uses: actions/setup-python@v5
126126
with:
127-
python-version: '3.11'
127+
python-version: '3.13'
128128

129129
- run: pip install -r tests/requirements.txt
130130

@@ -148,12 +148,11 @@ jobs:
148148
- name: set up python
149149
uses: actions/setup-python@v5
150150
with:
151-
python-version: '3.11'
151+
python-version: '3.13'
152152

153153
- name: resolve MSRV
154154
id: resolve-msrv
155-
run:
156-
echo MSRV=`python -c 'import tomllib; print(tomllib.load(open("Cargo.toml", "rb"))["package"]["rust-version"])'` >> $GITHUB_OUTPUT
155+
run: echo MSRV=`python -c 'import tomllib; print(tomllib.load(open("Cargo.toml", "rb"))["package"]["rust-version"])'` >> $GITHUB_OUTPUT
157156

158157
- name: install rust MSRV
159158
uses: dtolnay/rust-toolchain@master
@@ -184,7 +183,7 @@ jobs:
184183
fail-fast: false
185184
matrix:
186185
python-version:
187-
- '3.11'
186+
- '3.13'
188187
- 'pypy3.10'
189188

190189
steps:
@@ -223,7 +222,7 @@ jobs:
223222
- name: set up python
224223
uses: actions/setup-python@v5
225224
with:
226-
python-version: '3.11'
225+
python-version: '3.13'
227226

228227
- name: install rust stable
229228
uses: dtolnay/rust-toolchain@stable
@@ -246,6 +245,8 @@ jobs:
246245
# which xfail on a pending release of pydantic-core
247246
- run: pdm run pytest --override-ini=xfail_strict=False
248247
working-directory: pydantic
248+
env:
249+
PYDANTIC_PRIVATE_ALLOW_UNHANDLED_SCHEMA_TYPES: 1
249250

250251
lint:
251252
runs-on: ubuntu-latest
@@ -263,7 +264,7 @@ jobs:
263264

264265
- uses: actions/setup-python@v5
265266
with:
266-
python-version: '3.11'
267+
python-version: '3.13'
267268

268269
# used to lint js code
269270
- uses: actions/setup-node@v4
@@ -309,7 +310,7 @@ jobs:
309310

310311
- uses: actions/setup-python@v5
311312
with:
312-
python-version: '3.10'
313+
python-version: '3.13'
313314

314315
- run: pip install typing_extensions
315316

@@ -324,7 +325,7 @@ jobs:
324325
id: setup-python
325326
uses: actions/setup-python@v5
326327
with:
327-
python-version: '3.11'
328+
python-version: '3.13'
328329

329330
- name: install rust nightly
330331
uses: dtolnay/rust-toolchain@nightly
@@ -357,8 +358,8 @@ jobs:
357358
- run: npm run test
358359

359360
- run: |
360-
ls -lh dist/
361-
ls -l dist/
361+
ls -lh dist/
362+
ls -l dist/
362363
363364
- uses: actions/upload-artifact@v4
364365
with:
@@ -382,6 +383,9 @@ jobs:
382383
runs-on: ubuntu-latest
383384
steps:
384385
- uses: actions/checkout@v4
386+
- uses: actions/setup-python@v5
387+
with:
388+
python-version: '3.13'
385389
- uses: PyO3/maturin-action@v1
386390
with:
387391
command: sdist
@@ -434,6 +438,9 @@ jobs:
434438
- os: linux
435439
manylinux: musllinux_1_1
436440
target: aarch64
441+
- os: linux
442+
manylinux: musllinux_1_1
443+
target: armv7
437444

438445
# macos;
439446
# all versions x86_64
@@ -471,7 +478,7 @@ jobs:
471478
- name: set up python
472479
uses: actions/setup-python@v5
473480
with:
474-
python-version: '3.11'
481+
python-version: '3.13'
475482
architecture: ${{ matrix.python-architecture || 'x64' }}
476483

477484
- run: pip install -U twine 'ruff==0.5.0' typing_extensions
@@ -559,7 +566,7 @@ jobs:
559566
rust-toolchain: ${{ steps.rust-toolchain.outputs.name }}
560567
docker-options: -e CI
561568
env:
562-
RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata"
569+
RUSTFLAGS: '-Cprofile-generate=${{ github.workspace }}/profdata'
563570

564571
- name: detect rust host
565572
run: echo RUST_HOST=$(rustc -Vv | grep host | cut -d ' ' -f 2) >> "$GITHUB_ENV"
@@ -587,7 +594,7 @@ jobs:
587594
rust-toolchain: ${{steps.rust-toolchain.outputs.name}}
588595
docker-options: -e CI
589596
env:
590-
RUSTFLAGS: "-Cprofile-use=${{ github.workspace }}/merged.profdata"
597+
RUSTFLAGS: '-Cprofile-use=${{ github.workspace }}/merged.profdata'
591598

592599
- run: ${{ matrix.ls || 'ls -lh' }} dist/
593600

@@ -612,20 +619,20 @@ jobs:
612619

613620
- name: list dist files
614621
run: |
615-
ls -lh dist/
616-
ls -l dist/
617-
echo "`ls dist | wc -l` files"
622+
ls -lh dist/
623+
ls -l dist/
624+
echo "`ls dist | wc -l` files"
618625
619626
- name: extract and list sdist file
620627
run: |
621-
mkdir sdist-files
622-
tar -xvf dist/*.tar.gz -C sdist-files
623-
tree -a sdist-files
628+
mkdir sdist-files
629+
tar -xvf dist/*.tar.gz -C sdist-files
630+
tree -a sdist-files
624631
625632
- name: extract and list wheel file
626633
run: |
627-
ls dist/*cp310-manylinux*x86_64.whl | head -n 1
628-
python -m zipfile --list `ls dist/*cp310-manylinux*x86_64.whl | head -n 1`
634+
ls dist/*cp310-manylinux*x86_64.whl | head -n 1
635+
python -m zipfile --list `ls dist/*cp310-manylinux*x86_64.whl | head -n 1`
629636
630637
test-builds-arch:
631638
name: test build on ${{ matrix.target }}-${{ matrix.distro }}
@@ -651,7 +658,7 @@ jobs:
651658
merge-multiple: true
652659
path: dist
653660

654-
- uses: uraimo/run-on-arch-action@v2.7.2
661+
- uses: uraimo/run-on-arch-action@v2.8.1
655662
name: install & test
656663
with:
657664
arch: ${{ matrix.target }}
@@ -693,7 +700,7 @@ jobs:
693700
- name: set up python
694701
uses: actions/setup-python@v5
695702
with:
696-
python-version: '3.11'
703+
python-version: '3.13'
697704

698705
- name: get dist artifacts
699706
uses: actions/download-artifact@v4
@@ -717,7 +724,7 @@ jobs:
717724
- name: set up python
718725
uses: actions/setup-python@v5
719726
with:
720-
python-version: '3.10'
727+
python-version: '3.13'
721728

722729
- run: pip install -U twine
723730

.github/workflows/codspeed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ on:
1111

1212
jobs:
1313
benchmarks:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515

1616
steps:
1717
- uses: actions/checkout@v4
1818

1919
- uses: actions/setup-python@v5
2020
with:
21-
python-version: '3.12'
21+
python-version: '3.13'
2222

2323
- uses: actions/cache@v4
2424
id: cache-py

Cargo.lock

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

0 commit comments

Comments
 (0)