update PyO3 to 0.26 (#219)

Author: davidhewitt

Cargo.toml

@@ -25,5 +25,5 @@ inherits = "release"
 debug = true
 
 [workspace.dependencies]
-pyo3 = { version = "0.25" }
-pyo3-build-config = { version = "0.25" }
+pyo3 = { version = "0.26" }
+pyo3-build-config = { version = "0.26" }

crates/jiter-python/Cargo.toml

@@ -16,7 +16,7 @@ jiter = { path = "../jiter", features = ["python", "num-bigint"] }
 
 [features]
 # make extensions visible to cargo vendor
-extension-module = ["pyo3/extension-module", "pyo3/generate-import-lib"]
+extension-module = ["pyo3/generate-import-lib"]
 
 [lib]
 name = "jiter_python"

crates/jiter-python/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=1,<2"]
+requires = ["maturin>=1.9.4,<2"]
 build-backend = "maturin"
 
 [project]
@@ -40,7 +40,7 @@ dynamic = ["version"]
 [tool.maturin]
 module-name = "jiter"
 bindings = "pyo3"
-features = ["pyo3/extension-module", "pyo3/generate-import-lib"]
+features = ["pyo3/generate-import-lib"]
 
 [tool.ruff]
 target-version = "py39"

crates/jiter/benches/python.rs

@@ -9,7 +9,7 @@ use pyo3::Python;
 use jiter::{cache_clear, PythonParse, StringCacheMode};
 
 fn python_parse_numeric(c: &mut Criterion) {
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         cache_clear();
         c.bench_function("python_parse_numeric", |bench| {
             bench.iter(|| {
@@ -25,7 +25,7 @@ fn python_parse_numeric(c: &mut Criterion) {
 }
 
 fn python_parse_other(c: &mut Criterion) {
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         cache_clear();
         c.bench_function("python_parse_other", |bench| {
             bench.iter(|| {
@@ -55,7 +55,7 @@ fn python_parse_file(path: &str, c: &mut Criterion, cache_mode: StringCacheMode)
         "python_parse_".to_owned() + file_stem + cache_mode
     };
 
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         cache_clear();
 
         c.bench_function(&title, |bench| {

crates/jiter/src/py_lossless_float.rs

@@ -1,6 +1,6 @@
 use pyo3::exceptions::{PyTypeError, PyValueError};
 use pyo3::prelude::*;
-use pyo3::sync::GILOnceCell;
+use pyo3::sync::PyOnceLock;
 use pyo3::types::PyType;
 
 use crate::Jiter;
@@ -87,7 +87,7 @@ impl LosslessFloat {
     }
 }
 
-static DECIMAL_TYPE: GILOnceCell<Py<PyType>> = GILOnceCell::new();
+static DECIMAL_TYPE: PyOnceLock<Py<PyType>> = PyOnceLock::new();
 
 pub fn get_decimal_type(py: Python<'_>) -> PyResult<&Bound<'_, PyType>> {
     DECIMAL_TYPE.import(py, "decimal", "Decimal")

crates/jiter/tests/python.rs

@@ -11,7 +11,7 @@ fn test_to_py_object_numeric() {
         false,
     )
     .unwrap();
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         let python_value = value.into_pyobject(py).unwrap();
         let string = python_value.to_string();
         assert_eq!(
@@ -28,7 +28,7 @@ fn test_to_py_object_other() {
         true,
     )
     .unwrap();
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         let python_value = value.into_pyobject(py).unwrap();
         let string = python_value.to_string();
         assert_eq!(string, "['string', '£', True, False, None, nan, inf, -inf]");
@@ -37,7 +37,7 @@ fn test_to_py_object_other() {
 
 #[test]
 fn test_cache_into() {
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         let c: StringCacheMode = true.into_pyobject(py).unwrap().extract().unwrap();
         assert!(matches!(c, StringCacheMode::All));
 
@@ -73,15 +73,15 @@ fn test_cache_into() {
 #[test]
 fn test_pystring_ascii_new() {
     let json = "100abc";
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         let s = unsafe { pystring_ascii_new(py, json) };
         assert_eq!(s.to_string(), "100abc");
     });
 }
 
 #[test]
 fn test_python_parse_default() {
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         let v = PythonParse::default().python_parse(py, b"[123]").unwrap();
         assert_eq!(v.to_string(), "[123]");
     });