Skip to content

Commit 805c64a

Browse files
committed
Merge remote-tracking branch 'origin/main' into more-fail-fast
2 parents 7642acc + 562fad3 commit 805c64a

Some content is hidden

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

87 files changed

+772
-679
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pydantic-core"
3-
version = "2.27.1"
3+
version = "2.27.2"
44
edition = "2021"
55
license = "MIT"
66
homepage = "https://github.com/pydantic/pydantic-core"
@@ -35,7 +35,7 @@ strum = { version = "0.26.3", features = ["derive"] }
3535
strum_macros = "0.26.4"
3636
serde_json = {version = "1.0.133", features = ["arbitrary_precision", "preserve_order"]}
3737
enum_dispatch = "0.3.13"
38-
serde = { version = "1.0.215", features = ["derive"] }
38+
serde = { version = "1.0.216", features = ["derive"] }
3939
speedate = "0.15.0"
4040
smallvec = "1.13.2"
4141
ahash = "0.8.10"

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ install-rust-coverage:
3939
build-dev:
4040
@rm -f python/pydantic_core/*.so
4141
ifneq ($(USE_MATURIN),)
42-
uv run maturin develop
42+
uv run maturin develop --uv
4343
else
4444
uv pip install --force-reinstall -v -e . --config-settings=build-args='--profile dev'
4545
endif
@@ -48,7 +48,7 @@ endif
4848
build-prod:
4949
@rm -f python/pydantic_core/*.so
5050
ifneq ($(USE_MATURIN),)
51-
uv run maturin develop --release
51+
uv run maturin develop --uv --release
5252
else
5353
uv pip install -v -e .
5454
endif
@@ -57,7 +57,7 @@ endif
5757
build-profiling:
5858
@rm -f python/pydantic_core/*.so
5959
ifneq ($(USE_MATURIN),)
60-
uv run maturin develop --profile profiling
60+
uv run maturin develop --uv --profile profiling
6161
else
6262
uv pip install --force-reinstall -v -e . --config-settings=build-args='--profile profiling'
6363
endif
@@ -66,7 +66,7 @@ endif
6666
build-coverage:
6767
@rm -f python/pydantic_core/*.so
6868
ifneq ($(USE_MATURIN),)
69-
RUSTFLAGS='-C instrument-coverage' uv run maturin develop --release
69+
RUSTFLAGS='-C instrument-coverage' uv run maturin develop --uv --release
7070
else
7171
RUSTFLAGS='-C instrument-coverage' uv pip install -v -e .
7272
endif
@@ -76,15 +76,15 @@ build-pgo:
7676
@rm -f python/pydantic_core/*.so
7777
$(eval PROFDATA := $(shell mktemp -d))
7878
ifneq ($(USE_MATURIN),)
79-
RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv run maturin develop --release
79+
RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv run maturin develop --uv --release
8080
else
8181
RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv pip install --force-reinstall -v -e .
8282
endif
8383
pytest tests/benchmarks
8484
$(eval LLVM_PROFDATA := $(shell rustup run stable bash -c 'echo $$RUSTUP_HOME/toolchains/$$RUSTUP_TOOLCHAIN/lib/rustlib/$$(rustc -Vv | grep host | cut -d " " -f 2)/bin/llvm-profdata'))
8585
$(LLVM_PROFDATA) merge -o $(PROFDATA)/merged.profdata $(PROFDATA)
8686
ifneq ($(USE_MATURIN),)
87-
RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv run maturin develop --release
87+
RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv run maturin develop --uv --release
8888
else
8989
RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv pip install --force-reinstall -v -e .
9090
endif

0 commit comments

Comments
 (0)