Merge branch 'pydantic:main' into dev-url-join

Author: Meetesh-Saini

.github/workflows/ci.yml

@@ -455,10 +455,9 @@ jobs:
             target: i686
             python-architecture: x86
             interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
-          # FIXME aarch64 builds broken, see https://github.com/PyO3/maturin/issues/2110
-          # - os: windows
-          #   target: aarch64
-          #   interpreter: 3.11 3.12 3.13
+          - os: windows
+            target: aarch64
+            interpreter: 3.11 3.12 3.13
 
         exclude:
           # See above; disabled for now.
@@ -486,7 +485,9 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: ${{ matrix.manylinux }}
           args: --release --out dist --interpreter ${{ matrix.interpreter || '3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10' }}
-          rust-toolchain: stable
+          # Limit windows builds to 1.77 to keep Windows 7 support.
+          # FIXME: Unpin when Python 3.8 support is dropped. (3.9 requires Windows 10)
+          rust-toolchain: ${{ (matrix.os == 'windows' && '1.77') || 'stable' }}
           docker-options: -e CI
 
       - run: ${{ (matrix.os == 'windows' && 'dir') || 'ls -lh' }} dist/
@@ -535,17 +536,18 @@ jobs:
 
       - name: install rust stable
         id: rust-toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@master
         with:
           components: llvm-tools
+          # Limit windows builds to 1.77 to keep Windows 7 support.
+          # FIXME: Unpin when Python 3.8 support is dropped. (3.9 requires Windows 10)
+          toolchain: ${{ (matrix.os == 'windows' && '1.77') || 'stable' }}
 
       - run: pip install -U 'ruff==0.5.0' typing_extensions
 
       # generate self-schema now, so we don't have to do so inside docker in maturin build
       - run: python generate_self_schema.py
 
-      - run: rustc --version --verbose
-
       - name: build initial wheel
         uses: PyO3/maturin-action@v1
         with:
@@ -554,7 +556,7 @@ jobs:
             --release
             --out pgo-wheel
             --interpreter ${{ matrix.interpreter }}
-          rust-toolchain: stable
+          rust-toolchain: ${{ steps.rust-toolchain.outputs.name }}
           docker-options: -e CI
         env:
           RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata"
@@ -569,7 +571,7 @@ jobs:
           pip install -r tests/requirements.txt
           pip install pydantic-core --no-index --no-deps --find-links pgo-wheel --force-reinstall
           pytest tests/benchmarks
-          rustup run stable bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/${{ env.RUST_HOST }}/bin/llvm-profdata >> "$GITHUB_ENV"'
+          rustup run ${{ steps.rust-toolchain.outputs.name }} bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/${{ env.RUST_HOST }}/bin/llvm-profdata >> "$GITHUB_ENV"'
 
       - name: merge pgo data
         run: ${{ env.LLVM_PROFDATA }} merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata
@@ -582,7 +584,7 @@ jobs:
             --release
             --out dist
             --interpreter ${{ matrix.interpreter }}
-          rust-toolchain: stable
+          rust-toolchain: ${{steps.rust-toolchain.outputs.name}}
           docker-options: -e CI
         env:
           RUSTFLAGS: "-Cprofile-use=${{ github.workspace }}/merged.profdata"

.github/workflows/codspeed.yml

@@ -68,6 +68,6 @@ jobs:
           RUSTFLAGS: "-Cprofile-use=${{ github.workspace }}/merged.profdata"
 
       - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@v2
+        uses: CodSpeedHQ/action@v3
         with:
           run: pytest tests/benchmarks/ --codspeed

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.24.0"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/pydantic/pydantic-core"
@@ -29,24 +29,25 @@ rust-version = "1.75"
 [dependencies]
 # TODO it would be very nice to remove the "py-clone" feature as it can panic,
 # but needs a bit of work to make sure it's not used in the codebase
-pyo3 = { version = "0.22.0", features = ["generate-import-lib", "num-bigint", "py-clone"] }
-regex = "1.10.4"
+pyo3 = { version = "0.22.2", features = ["generate-import-lib", "num-bigint", "py-clone"] }
+regex = "1.10.6"
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
-serde_json = {version = "1.0.116", features = ["arbitrary_precision", "preserve_order"]}
+serde_json = {version = "1.0.128", features = ["arbitrary_precision", "preserve_order"]}
 enum_dispatch = "0.3.13"
-serde = { version = "1.0.203", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 speedate = "0.14.4"
 smallvec = "1.13.2"
 ahash = "0.8.10"
 url = "2.5.0"
 # idna is already required by url, added here to be explicit
-idna = "1.0.1"
-base64 = "0.21.7"
+idna = "1.0.2"
+base64 = "0.22.1"
 num-bigint = "0.4.6"
 python3-dll-a = "0.2.10"
-uuid = "1.9.1"
+uuid = "1.10.0"
 jiter = { version = "0.5", features = ["python"] }
+hex = "0.4.3"
 
 [lib]
 name = "_pydantic_core"
@@ -73,10 +74,10 @@ debug = true
 strip = false
 
 [dev-dependencies]
-pyo3 = { version = "0.22.0", features = ["auto-initialize"] }
+pyo3 = { version = "0.22.2", features = ["auto-initialize"] }
 
 [build-dependencies]
-version_check = "0.9.4"
+version_check = "0.9.5"
 # used where logic has to be version/distribution specific, e.g. pypy
 pyo3-build-config = { version = "0.22.0" }
 

Cargo.toml

@@ -35,6 +35,16 @@ fn main() {
     if let Some(true) = version_check::supports_feature("coverage_attribute") {
         println!("cargo:rustc-cfg=has_coverage_attribute");
     }
+    println!("cargo:rustc-check-cfg=cfg(has_coverage_attribute)");
+
+    if std::env::var("RUSTFLAGS")
+        .unwrap_or_default()
+        .contains("-Cprofile-use=")
+    {
+        println!("cargo:rustc-cfg=specified_profile_use");
+    }
+    println!("cargo:rustc-check-cfg=cfg(specified_profile_use)");
+
     generate_self_schema();
     println!("cargo:rustc-env=PROFILE={}", std::env::var("PROFILE").unwrap());
 }

build.rs

@@ -50,7 +50,7 @@
 def get_schema(obj: Any, definitions: dict[str, core_schema.CoreSchema]) -> core_schema.CoreSchema:  # noqa: C901
     if isinstance(obj, str):
         return {'type': obj}
-    elif obj in (datetime, timedelta, date, time, bool, int, float, str, decimal.Decimal):
+    elif obj in (datetime, timedelta, date, time, bool, int, float, str, decimal.Decimal, complex):
         return {'type': obj.__name__.lower()}
     elif is_typeddict(obj):
         return type_dict_schema(obj, definitions)

generate_self_schema.py

@@ -103,8 +103,7 @@ exclude_lines = [
 
 # configuring https://github.com/pydantic/hooky
 [tool.hooky]
-assignees = ['samuelcolvin', 'adriangb', 'dmontagu', 'davidhewitt', 'lig']
-reviewers = ['samuelcolvin', 'adriangb', 'dmontagu', 'davidhewitt']
+reviewers = ['sydney-runkle', 'davidhewitt']
 require_change_file = false
 
 [tool.pyright]

pyproject.toml

@@ -34,7 +34,7 @@
 else:
     from typing import NotRequired as _NotRequired
 
-if _sys.version_info < (3, 9):
+if _sys.version_info < (3, 12):
     from typing_extensions import TypedDict as _TypedDict
 else:
     from typing import TypedDict as _TypedDict