Prepare for pyo3 0.26 (#54)

* Bump to 0.26

* Prepare for pyo3 0.26

* fix macros

* Remove unneeded into_pyobject

* lint

* Replace some `OnceCell` with `PyOnceLock`

* Use released v0.26

* Bump msrv to 1.74

* Remove setting MSRV deps in CI and use stdlib instead of once_cell where possible

* move import into function

* bump msrv in CI test

* simplify `GenericSender::send

---------

Co-authored-by: David Hewitt <[email protected]>

Author: kylebarron

.github/workflows/ci.yml

@@ -79,7 +79,7 @@ jobs:
           ]
         include:
           # Test minimal supported Rust version
-          - rust: 1.63.0
+          - rust: 1.74.0
             python-version: "3.13"
             platform:
               {
@@ -126,12 +126,6 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.platform.rust-target }}
 
-      - if: ${{ matrix.msrv == 'MSRV' }}
-        name: Set MSRV dependencies
-        run: |
-          cargo add tokio@=1.38.1
-          cargo update -p once_cell --precise 1.20.3
-
       - name: Build (no features)
         run: cargo build --no-default-features --verbose --target ${{ matrix.platform.rust-target }}
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pyo3-async-runtimes"
 description = "PyO3 bridges from Rust runtimes to Python's Asyncio library"
-version = "0.25.0"
+version = "0.26.0"
 authors = [
     "Andrew J Westlake <[email protected]>",
     "David Hewitt <[email protected]>",
@@ -15,7 +15,7 @@ categories = ["api-bindings", "development-tools::ffi"]
 license = "Apache-2.0"
 exclude = ["/.gitignore", "/codecov.yml", "/Makefile"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.74"
 
 [workspace]
 members = ["pyo3-async-runtimes-macros"]
@@ -120,11 +120,11 @@ futures = "0.3"
 inventory = { version = "0.3", optional = true }
 once_cell = "1.14"
 pin-project-lite = "0.2"
-pyo3 = "0.25"
-pyo3-async-runtimes-macros = { path = "pyo3-async-runtimes-macros", version = "=0.25.0", optional = true }
+pyo3 = "0.26"
+pyo3-async-runtimes-macros = { path = "pyo3-async-runtimes-macros", version = "=0.26.0", optional = true }
 
 [dev-dependencies]
-pyo3 = { version = "0.25", features = ["macros"] }
+pyo3 = { version = "0.26", features = ["macros"] }
 
 [dependencies.async-std]
 version = "1.12"

README.md

@@ -50,8 +50,8 @@ Here we initialize the runtime, import Python's `asyncio` library and run the gi
 ```toml
 # Cargo.toml dependencies
 [dependencies]
-pyo3 = { version = "0.25" }
-pyo3-async-runtimes = { version = "0.25", features = ["attributes", "async-std-runtime"] }
+pyo3 = { version = "0.26" }
+pyo3-async-runtimes = { version = "0.26", features = ["attributes", "async-std-runtime"] }
 async-std = "1.13"
 ```
 
@@ -62,10 +62,10 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::async_std::main]
 async fn main() -> PyResult<()> {
-    let fut = Python::with_gil(|py| {
+    let fut = Python::attach(|py| {
         let asyncio = py.import("asyncio")?;
         // convert asyncio.sleep into a Rust Future
-        pyo3_async_runtimes::async_std::into_future(asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?)
+        pyo3_async_runtimes::async_std::into_future(asyncio.call_method1("sleep", (1,))?)
     })?;
 
     fut.await?;
@@ -80,8 +80,8 @@ attribute.
 ```toml
 # Cargo.toml dependencies
 [dependencies]
-pyo3 = { version = "0.25" }
-pyo3-async-runtimes = { version = "0.25", features = ["attributes", "tokio-runtime"] }
+pyo3 = { version = "0.26" }
+pyo3-async-runtimes = { version = "0.26", features = ["attributes", "tokio-runtime"] }
 tokio = "1.40"
 ```
 
@@ -92,10 +92,10 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::tokio::main]
 async fn main() -> PyResult<()> {
-    let fut = Python::with_gil(|py| {
+    let fut = Python::attach(|py| {
         let asyncio = py.import("asyncio")?;
         // convert asyncio.sleep into a Rust Future
-        pyo3_async_runtimes::tokio::into_future(asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?)
+        pyo3_async_runtimes::tokio::into_future(asyncio.call_method1("sleep", (1,))?)
     })?;
 
     fut.await?;
@@ -126,17 +126,17 @@ For `async-std`:
 
 ```toml
 [dependencies]
-pyo3 = { version = "0.25", features = ["extension-module"] }
-pyo3-async-runtimes = { version = "0.25", features = ["async-std-runtime"] }
+pyo3 = { version = "0.26", features = ["extension-module"] }
+pyo3-async-runtimes = { version = "0.26", features = ["async-std-runtime"] }
 async-std = "1.13"
 ```
 
 For `tokio`:
 
 ```toml
 [dependencies]
-pyo3 = { version = "0.25", features = ["extension-module"] }
-pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime"] }
+pyo3 = { version = "0.26", features = ["extension-module"] }
+pyo3-async-runtimes = { version = "0.26", features = ["tokio-runtime"] }
 tokio = "1.40"
 ```
 
@@ -234,7 +234,7 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::tokio::main]
 async fn main() -> PyResult<()> {
-    let future = Python::with_gil(|py| -> PyResult<_> {
+    let future = Python::attach(|py| -> PyResult<_> {
         // import the module containing the py_sleep function
         let example = py.import("example")?;
 
@@ -354,12 +354,12 @@ use pyo3::prelude::*;
 async fn main() -> PyResult<()> {
     // PyO3 is initialized - Ready to go
 
-    let fut = Python::with_gil(|py| -> PyResult<_> {
+    let fut = Python::attach(|py| -> PyResult<_> {
         let asyncio = py.import("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
         pyo3_async_runtimes::async_std::into_future(
-            asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?
+            asyncio.call_method1("sleep", (1,))?
         )
     })?;
 
@@ -430,8 +430,8 @@ name = "my_async_module"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.25", features = ["extension-module"] }
-pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime"] }
+pyo3 = { version = "0.26", features = ["extension-module"] }
+pyo3-async-runtimes = { version = "0.26", features = ["tokio-runtime"] }
 async-std = "1.13"
 tokio = "1.40"
 ```
@@ -490,8 +490,8 @@ event loop before we can install the `uvloop` policy.
 ```toml
 [dependencies]
 async-std = "1.13"
-pyo3 = "0.25"
-pyo3-async-runtimes = { version = "0.25", features = ["async-std-runtime"] }
+pyo3 = "0.26"
+pyo3-async-runtimes = { version = "0.26", features = ["async-std-runtime"] }
 ```
 
 ```rust no_run
@@ -500,18 +500,18 @@ pyo3-async-runtimes = { version = "0.25", features = ["async-std-runtime"] }
 use pyo3::{prelude::*, types::PyType};
 
 fn main() -> PyResult<()> {
-    pyo3::prepare_freethreaded_python();
+    Python::initialize();
 
-    Python::with_gil(|py| {
+    Python::attach(|py| {
         let uvloop = py.import("uvloop")?;
         uvloop.call_method0("install")?;
 
         // store a reference for the assertion
-        let uvloop = PyObject::from(uvloop);
+        let uvloop: Py<PyAny> = uvloop.into();
 
         pyo3_async_runtimes::async_std::run(py, async move {
             // verify that we are on a uvloop.Loop
-            Python::with_gil(|py| -> PyResult<()> {
+            Python::attach(|py| -> PyResult<()> {
                 assert!(uvloop
                     .bind(py)
                     .getattr("Loop")?

examples/async_std.rs

@@ -2,13 +2,11 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::async_std::main]
 async fn main() -> PyResult<()> {
-    let fut = Python::with_gil(|py| {
+    let fut = Python::attach(|py| {
         let asyncio = py.import("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
-        pyo3_async_runtimes::async_std::into_future(
-            asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?,
-        )
+        pyo3_async_runtimes::async_std::into_future(asyncio.call_method1("sleep", (1,))?)
     })?;
 
     println!("sleeping for 1s");

examples/tokio.rs

@@ -2,13 +2,11 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::tokio::main]
 async fn main() -> PyResult<()> {
-    let fut = Python::with_gil(|py| {
+    let fut = Python::attach(|py| {
         let asyncio = py.import("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
-        pyo3_async_runtimes::tokio::into_future(
-            asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?,
-        )
+        pyo3_async_runtimes::tokio::into_future(asyncio.call_method1("sleep", (1,))?)
     })?;
 
     println!("sleeping for 1s");

examples/tokio_current_thread.rs

@@ -2,13 +2,11 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::tokio::main(flavor = "current_thread")]
 async fn main() -> PyResult<()> {
-    let fut = Python::with_gil(|py| {
+    let fut = Python::attach(|py| {
         let asyncio = py.import("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
-        pyo3_async_runtimes::tokio::into_future(
-            asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?,
-        )
+        pyo3_async_runtimes::tokio::into_future(asyncio.call_method1("sleep", (1,))?)
     })?;
 
     println!("sleeping for 1s");

examples/tokio_multi_thread.rs

@@ -2,13 +2,11 @@ use pyo3::prelude::*;
 
 #[pyo3_async_runtimes::tokio::main(flavor = "multi_thread", worker_threads = 10)]
 async fn main() -> PyResult<()> {
-    let fut = Python::with_gil(|py| {
+    let fut = Python::attach(|py| {
         let asyncio = py.import("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
-        pyo3_async_runtimes::tokio::into_future(
-            asyncio.call_method1("sleep", (1.into_pyobject(py).unwrap(),))?,
-        )
+        pyo3_async_runtimes::tokio::into_future(asyncio.call_method1("sleep", (1,))?)
     })?;
 
     println!("sleeping for 1s");

pyo3-async-runtimes-macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pyo3-async-runtimes-macros"
 description = "Proc Macro Attributes for `pyo3-async-runtimes`"
-version = "0.25.0"
+version = "0.26.0"
 authors = [
     "Andrew J Westlake <[email protected]>",
     "David Hewitt <[email protected]>",

pyo3-async-runtimes-macros/src/lib.rs

@@ -49,9 +49,9 @@ pub fn async_std_main(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 #body
             }
 
-            pyo3::prepare_freethreaded_python();
+            pyo3::Python::initialize();
 
-            pyo3::Python::with_gil(|py| {
+            pyo3::Python::attach(|py| {
                 pyo3_async_runtimes::async_std::run(py, main())
                     .map_err(|e| {
                         e.print_and_set_sys_last_vars(py);
@@ -129,7 +129,7 @@ pub fn tokio_main(args: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// // blocking test functions can optionally accept an event_loop parameter
 /// #[pyo3_async_runtimes::async_std::test]
-/// fn test_blocking_sleep_with_event_loop(event_loop: PyObject) -> PyResult<()> {
+/// fn test_blocking_sleep_with_event_loop(event_loop: Py<PyAny>) -> PyResult<()> {
 ///     thread::sleep(Duration::from_secs(1));
 ///     Ok(())
 /// }
@@ -154,7 +154,7 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
             }
         } else {
             quote! {
-                let event_loop = Python::with_gil(|py| {
+                let event_loop = pyo3::Python::attach(|py| {
                     pyo3_async_runtimes::async_std::get_current_loop(py).unwrap().into()
                 });
                 Box::pin(pyo3_async_runtimes::async_std::re_exports::spawn_blocking(move || {
@@ -226,7 +226,7 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// // blocking test functions can optionally accept an event_loop parameter
 /// #[pyo3_async_runtimes::tokio::test]
-/// fn test_blocking_sleep_with_event_loop(event_loop: PyObject) -> PyResult<()> {
+/// fn test_blocking_sleep_with_event_loop(event_loop: Py<PyAny>) -> PyResult<()> {
 ///     thread::sleep(Duration::from_secs(1));
 ///     Ok(())
 /// }
@@ -265,7 +265,7 @@ pub fn tokio_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
             }
         } else {
             quote! {
-                let event_loop = Python::with_gil(|py| {
+                let event_loop = pyo3::Python::attach(|py| {
                     pyo3_async_runtimes::tokio::get_current_loop(py).unwrap().into()
                 });
                 Box::pin(async move {

pyo3-async-runtimes-macros/src/tokio.rs

@@ -268,7 +268,7 @@ fn parse_knobs(
                 #body
             }
 
-            pyo3::prepare_freethreaded_python();
+            pyo3::Python::initialize();
 
             let mut builder = #builder;
             #builder_init;
@@ -277,7 +277,7 @@ fn parse_knobs(
 
             #rt_init
 
-            pyo3::Python::with_gil(|py| {
+            pyo3::Python::attach(|py| {
                 pyo3_async_runtimes::tokio::run(py, main())
                     .map_err(|e| {
                         e.print_and_set_sys_last_vars(py);