Skip to content

Commit e527443

Browse files
committed
Merge branch 'main' into dh/url-preserve-empty-path
2 parents f420a76 + ed0d1ca commit e527443

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1549
-1046
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
- 'pypy3.10'
7474
- 'pypy3.11'
7575
- 'graalpy-3.11'
76+
- 'graalpy-3.12'
7677

7778
runs-on: ubuntu-latest
7879

@@ -409,6 +410,7 @@ jobs:
409410
- os: linux
410411
manylinux: auto
411412
target: aarch64
413+
interpreter: 3.9 3.10 3.11 3.12 3.13 3.14 pypy3.10 pypy3.11 graalpy3.11 graalpy3.12
412414
- os: linux
413415
manylinux: auto
414416
target: armv7
@@ -428,7 +430,7 @@ jobs:
428430
- os: linux
429431
manylinux: auto
430432
target: x86_64
431-
interpreter: graalpy3.11
433+
interpreter: graalpy3.11 graalpy3.12
432434

433435
# musllinux
434436
- os: linux
@@ -446,9 +448,10 @@ jobs:
446448
# arm pypy and older pythons which can't be run on the arm hardware for PGO
447449
- os: macos
448450
target: x86_64
451+
interpreter: 3.9 3.10 3.11 3.12 3.13 3.14 pypy3.10 pypy3.11 graalpy3.11 graalpy3.12
449452
- os: macos
450453
target: aarch64
451-
interpreter: 3.9 pypy3.10 pypy3.11
454+
interpreter: 3.9 pypy3.10 pypy3.11 graalpy3.11 graalpy3.12
452455

453456
# windows;
454457
# x86_64 pypy builds are not PGO optimized
@@ -490,7 +493,6 @@ jobs:
490493
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.9 3.10 3.11 3.12 3.13 3.14 pypy3.10 pypy3.11' }}
491494
rust-toolchain: stable
492495
docker-options: -e CI
493-
before-script-linux: ${{ contains(matrix.interpreter, 'graalpy') && 'manylinux-interpreters ensure-all' || '' }}
494496

495497
- run: ${{ (matrix.os == 'windows' && 'dir') || 'ls -lh' }} dist/
496498

Cargo.lock

Lines changed: 14 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: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rust-version = "1.75"
2727
[dependencies]
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
30-
pyo3 = { version = "0.25", features = ["generate-import-lib", "num-bigint", "py-clone"] }
30+
pyo3 = { version = "0.26", features = ["generate-import-lib", "num-bigint", "py-clone"] }
3131
regex = "1.11.1"
3232
strum = { version = "0.27", features = ["derive"] }
3333
strum_macros = "0.27"
@@ -44,17 +44,13 @@ base64 = "0.22.1"
4444
num-bigint = "0.4.6"
4545
num-traits = "0.2.19"
4646
uuid = "1.17.0"
47-
jiter = { version = "0.10.0", features = ["python"] }
47+
jiter = { version = "0.11.0", features = ["python"] }
4848
hex = "0.4.3"
4949

5050
[lib]
5151
name = "_pydantic_core"
5252
crate-type = ["cdylib", "rlib"]
5353

54-
[features]
55-
# must be enabled when building with `cargo build`, maturin enables this automatically
56-
extension-module = ["pyo3/extension-module"]
57-
5854
[profile.release]
5955
lto = "fat"
6056
codegen-units = 1
@@ -72,12 +68,12 @@ debug = true
7268
strip = false
7369

7470
[dev-dependencies]
75-
pyo3 = { version = "0.25", features = ["auto-initialize"] }
71+
pyo3 = { version = "0.26", features = ["auto-initialize"] }
7672

7773
[build-dependencies]
7874
version_check = "0.9.5"
7975
# used where logic has to be version/distribution specific, e.g. pypy
80-
pyo3-build-config = { version = "0.25" }
76+
pyo3-build-config = { version = "0.26" }
8177

8278
[lints.clippy]
8379
dbg_macro = "warn"

0 commit comments

Comments
 (0)