Merge branch 'main' into descriptor

Author: MatthieuDartiailh

.github/workflows/benches.yml

@@ -20,9 +20,14 @@ jobs:
       - uses: actions/checkout@v6.0.2
       - uses: astral-sh/setup-uv@v7
         with:
-          # codspeed action needs to be run from within the final Python environment
-          activate-environment: true
           save-cache: ${{ github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'CI-save-pr-cache') }}
+
+      # Using this action is still necessary for CodSpeed to build flamegraphs correctly,
+      # see note about setup-python in https://codspeed.io/docs/benchmarks/python#recipes
+      - uses: actions/setup-python@v6
+        with:
+          python-version: ${{ env.UV_PYTHON }}
+
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rust-src

.github/workflows/netlify-deploy.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Post Netlify Preview Status to PR
         if: ${{ github.event.workflow_run.event == 'pull_request' }}
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

Cargo.toml

@@ -45,7 +45,7 @@ chrono = { version = "0.4.25", default-features = false, optional = true }
 chrono-tz = { version = ">= 0.10, < 0.11", default-features = false, optional = true }
 either = { version = "1.9", optional = true }
 eyre = { version = ">= 0.6.8, < 0.7", optional = true }
-hashbrown = { version = ">= 0.15.0, < 0.17", optional = true, default-features = false }
+hashbrown = { version = ">= 0.15.0, < 0.18", optional = true, default-features = false }
 indexmap = { version = ">= 2.5.0, < 3", optional = true }
 jiff-02 = { package = "jiff", version = "0.2", optional = true }
 num-bigint = { version = "0.4.4", optional = true }

guide/src/function/signature.md

@@ -265,10 +265,9 @@ Type:      builtin_function_or_method
 
 ### Type annotations in the signature
 
-When the `experimental-inspect` Cargo feature is enabled, the `signature` attribute can also contain type hints:
+The `signature` attribute can also contain type hints:
 
 ```rust
-# #[cfg(feature = "experimental-inspect")] {
 use pyo3::prelude::*;
 
 #[pymodule]
@@ -281,21 +280,21 @@ pub mod example {
       arg
    }
 }
-# }
 ```
 
 It enables the [work-in-progress capacity of PyO3 to autogenerate type stubs](../type-stub.md) to generate a file with the correct type hints:
 
 ```python
-def list_of_int_identity(arg: list[int]) -> list[int]: ...
+def list_of_int_identity(arg: "list[int]") -> "list[int]": ...
 ```
 
 instead of the generic:
 
 ```python
-import typing
+from typing import Any
 
-def list_of_int_identity(arg: typing.Any) -> typing.Any: ...
+def list_of_int_identity(arg: Any) -> Any: ...
 ```
 
-Note that currently type annotations must be written as Rust strings.
+Note that currently type annotations must be written as strings.
+Future enhancements of PyO3's typing support may include the ability to parse a limited subset of Python's type expression syntax.

guide/src/type-stub.md

@@ -66,10 +66,10 @@ class Class:
     def __eq__(self, other: Class) -> bool: ...
     def __ne__(self, other: Class) -> bool: ...
 
-def list_of_int_identity(arg: list[int]) -> list[int]: ...
+def list_of_int_identity(arg: "list[int]") -> "list[int]": ...
 ```
 
-The only piece of added syntax is that the `#[pyo3(signature = ...)]` attribute can now contain type annotations like `#[pyo3(signature = (arg: "list[int]") -> "list[int]")]` (note the `""` around type annotations).
+The only piece of new syntax is that the `#[pyo3(signature = ...)]` attribute can contain type annotations like `#[pyo3(signature = (arg: "list[int]") -> "list[int]")]` (note the `""` around type annotations).
 This is useful when PyO3 is not able to derive proper type annotations by itself.
 
 ## Constraints and limitations

newsfragments/5942.added.md

@@ -0,0 +1 @@
+Add FFI definitions `PyObject_GetAIter`, `PyAIter_Check`, `PyMapping_HasKeyWithError`, `PyMapping_HasKeyStringWithError`, `PyMapping_GetOptionalItem`, `PyMapping_GetOptionalItemString`, `PySequence_ITEM`, `PySequence_Fast_GET_SIZE`, `PySequence_Fast_GET_ITEM`, and `PySequence_Fast_ITEMS`.

newsfragments/5942.removed.md

@@ -0,0 +1,3 @@
+Remove private FFI definitions `_PyStack_AsDict`, `_PyObject_CallNoArg`, `_PyObject_FastCall`, `_PyObject_FastCallTstate`. `_PyObject_VectorcallTstate`, `_PyObject_MakeTpCall`, `_Py_CheckFunctionResult`, `_PyObject_CallFunction_SizeT`, `_PyObject_CallMethod_SizeT`, and `_PySequence_IterSearch`.
+
+Remove FFI definitions `PY_ITERSEARCH_COUNT`, `PY_ITERSEARCH_INDEX`, and `PY_ITERSEARCH_CONTAINS`.

newsfragments/5946.changed.md

@@ -0,0 +1,3 @@
+Removed use of the CPython-internal `_PyUnicode_COMPACT_DATA` symbol from PyO3's FFI test suite.
+Removed `_PySet_NextEntry` in `pyo3-ffi`; it is a CPython-internal API with no stability guarantee.
+Removed `_PyLong_NumBits` in `pyo3-ffi` and replaced its internal use with `int.bit_length()` for Python < 3.13 builds.

newsfragments/5947.added.md

@@ -0,0 +1,11 @@
+Added the following functions:
+
+* pub fn PyDict_SetDefault(mp: *mut PyObject, key: *mut PyObject, default_obj: *mut PyObject) -> *mut PyObject;
+* pub fn PyDict_SetDefaultRef(mp: *mut PyObject, key: *mut PyObject, default_obj: *mut PyObject, result: **mut PyObject) -> c_int;
+* pub fn PyDict_ContainsString(mp: *mut PyObject, key: *const char) -> c_int;
+* pub fn PyDict_Pop(dict: *mut PyObject, key: *mut PyObject, result: **mut PyObject) -> c_int;
+* pub fn PyDict_PopString(dict: *mut PyObject, key: *const c_char, result: **mut PyObject) -> c_int;
+* pub fn PyDict_ClearWatcher(watcher_id: c_int) -> c_int;
+* pub fn PyDict_Watch(watcher_id: c_int, dict: *mut PyObject) -> c_int;
+* pub fn PyDict_Unwatch(watcher_id: c_int, dict: *mut PyObject) -> c_int;
+* pub fn PyFrozenDict_New(iterable: *mut PyObject) -> *mut PyObject;

newsfragments/5949.added.md

@@ -0,0 +1,8 @@
+Added the following functions:
+
+* PyDate_FromDate
+* PyDateTime_FromDateAndTime
+* PyDateTime_FromDateAndTimeAndFold
+* PyTime_FromTime
+* PyTime_FromTimeAndFold
+* PyDelta_FromDSU