Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into more-fail-fast
Browse files Browse the repository at this point in the history
  • Loading branch information
uriyyo committed Dec 26, 2024
2 parents 7642acc + 562fad3 commit 805c64a
Show file tree
Hide file tree
Showing 87 changed files with 772 additions and 679 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pydantic-core"
version = "2.27.1"
version = "2.27.2"
edition = "2021"
license = "MIT"
homepage = "https://github.com/pydantic/pydantic-core"
Expand Down Expand Up @@ -35,7 +35,7 @@ strum = { version = "0.26.3", features = ["derive"] }
strum_macros = "0.26.4"
serde_json = {version = "1.0.133", features = ["arbitrary_precision", "preserve_order"]}
enum_dispatch = "0.3.13"
serde = { version = "1.0.215", features = ["derive"] }
serde = { version = "1.0.216", features = ["derive"] }
speedate = "0.15.0"
smallvec = "1.13.2"
ahash = "0.8.10"
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ install-rust-coverage:
build-dev:
@rm -f python/pydantic_core/*.so
ifneq ($(USE_MATURIN),)
uv run maturin develop
uv run maturin develop --uv
else
uv pip install --force-reinstall -v -e . --config-settings=build-args='--profile dev'
endif
Expand All @@ -48,7 +48,7 @@ endif
build-prod:
@rm -f python/pydantic_core/*.so
ifneq ($(USE_MATURIN),)
uv run maturin develop --release
uv run maturin develop --uv --release
else
uv pip install -v -e .
endif
Expand All @@ -57,7 +57,7 @@ endif
build-profiling:
@rm -f python/pydantic_core/*.so
ifneq ($(USE_MATURIN),)
uv run maturin develop --profile profiling
uv run maturin develop --uv --profile profiling
else
uv pip install --force-reinstall -v -e . --config-settings=build-args='--profile profiling'
endif
Expand All @@ -66,7 +66,7 @@ endif
build-coverage:
@rm -f python/pydantic_core/*.so
ifneq ($(USE_MATURIN),)
RUSTFLAGS='-C instrument-coverage' uv run maturin develop --release
RUSTFLAGS='-C instrument-coverage' uv run maturin develop --uv --release
else
RUSTFLAGS='-C instrument-coverage' uv pip install -v -e .
endif
Expand All @@ -76,15 +76,15 @@ build-pgo:
@rm -f python/pydantic_core/*.so
$(eval PROFDATA := $(shell mktemp -d))
ifneq ($(USE_MATURIN),)
RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv run maturin develop --release
RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv run maturin develop --uv --release
else
RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv pip install --force-reinstall -v -e .
endif
pytest tests/benchmarks
$(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'))
$(LLVM_PROFDATA) merge -o $(PROFDATA)/merged.profdata $(PROFDATA)
ifneq ($(USE_MATURIN),)
RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv run maturin develop --release
RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv run maturin develop --uv --release
else
RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv pip install --force-reinstall -v -e .
endif
Expand Down
Loading

0 comments on commit 805c64a

Please sign in to comment.