temporarily fork as -0-21 suffixed variant

Author: davidhewitt

Cargo.toml

@@ -1,24 +1,28 @@
 [package]
-name = "pyo3-asyncio"
-description = "PyO3 utilities for Python's Asyncio library"
+name = "pyo3-asyncio-0-21"
+description = "PyO3 utilities for Python's Asyncio library - 0.21 fork"
 version = "0.21.0"
-authors = ["Andrew J Westlake <[email protected]>"]
+authors = [
+    "Andrew J Westlake <[email protected]>",
+    "David Hewitt <[email protected]>",
+]
 readme = "README.md"
 keywords = ["pyo3", "python", "ffi", "async", "asyncio"]
-homepage = "https://github.com/awestlake87/pyo3-asyncio"
-repository = "https://github.com/awestlake87/pyo3-asyncio"
-documentation = "https://docs.rs/crate/pyo3-asyncio/"
+homepage = "https://github.com/davidhewitt/pyo3-asyncio"
+repository = "https://github.com/davidhewitt/pyo3-asyncio"
+documentation = "https://docs.rs/crate/pyo3-asyncio-0-21/"
 categories = ["api-bindings", "development-tools::ffi"]
 license = "Apache-2.0"
 exclude = ["/.gitignore", "/codecov.yml", "/Makefile"]
 edition = "2021"
+rust-version = "1.63"
 
 [workspace]
 members = ["pyo3-asyncio-macros"]
 
 [features]
 async-std-runtime = ["async-std"]
-attributes = ["pyo3-asyncio-macros"]
+attributes = ["pyo3-asyncio-macros-0-21"]
 testing = ["clap", "inventory"]
 tokio-runtime = ["tokio"]
 unstable-streams = ["async-channel"]
@@ -117,7 +121,7 @@ inventory = { version = "0.3", optional = true }
 once_cell = "1.14"
 pin-project-lite = "0.2"
 pyo3 = "0.21"
-pyo3-asyncio-macros = { path = "pyo3-asyncio-macros", version = "=0.20.0", optional = true }
+pyo3-asyncio-macros-0-21 = { path = "pyo3-asyncio-macros", version = "=0.21.0", optional = true }
 
 [dev-dependencies]
 pyo3 = { version = "0.21", features = ["macros"] }

README.md

@@ -1,12 +1,12 @@
 use pyo3::prelude::*;
 
-#[pyo3_asyncio::async_std::main]
+#[pyo3_asyncio_0_21::async_std::main]
 async fn main() -> PyResult<()> {
     let fut = Python::with_gil(|py| {
         let asyncio = py.import_bound("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
-        pyo3_asyncio::async_std::into_future(asyncio.call_method1("sleep", (1.into_py(py),))?)
+        pyo3_asyncio_0_21::async_std::into_future(asyncio.call_method1("sleep", (1.into_py(py),))?)
     })?;
 
     println!("sleeping for 1s");

examples/async_std.rs

@@ -1,12 +1,12 @@
 use pyo3::prelude::*;
 
-#[pyo3_asyncio::tokio::main]
+#[pyo3_asyncio_0_21::tokio::main]
 async fn main() -> PyResult<()> {
     let fut = Python::with_gil(|py| {
         let asyncio = py.import_bound("asyncio")?;
 
         // convert asyncio.sleep into a Rust Future
-        pyo3_asyncio::tokio::into_future(asyncio.call_method1("sleep", (1.into_py(py),))?)
+        pyo3_asyncio_0_21::tokio::into_future(asyncio.call_method1("sleep", (1.into_py(py),))?)
     })?;
 
     println!("sleeping for 1s");

examples/tokio.rs

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

examples/tokio_current_thread.rs

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

examples/tokio_multi_thread.rs

@@ -1,13 +1,16 @@
 [package]
-name = "pyo3-asyncio-macros"
-description = "Proc Macro Attributes for PyO3 Asyncio"
-version = "0.20.0"
-authors = ["Andrew J Westlake <[email protected]>"]
+name = "pyo3-asyncio-macros-0-21"
+description = "Proc Macro Attributes for PyO3 Asyncio - 0.21 fork"
+version = "0.21.0"
+authors = [
+    "Andrew J Westlake <[email protected]>",
+    "David Hewitt <[email protected]>",
+]
 readme = "../README.md"
 keywords = ["pyo3", "python", "ffi", "async", "asyncio"]
-homepage = "https://github.com/awestlake87/pyo3-asyncio"
-repository = "https://github.com/awestlake87/pyo3-asyncio"
-documentation = "https://docs.rs/crate/pyo3-asyncio/"
+homepage = "https://github.com/davidhewitt/pyo3-asyncio"
+repository = "https://github.com/davidhewitt/pyo3-asyncio"
+documentation = "https://docs.rs/crate/pyo3-asyncio-0-21/"
 categories = ["api-bindings", "development-tools::ffi"]
 license = "Apache-2.0"
 edition = "2018"

pyo3-asyncio-macros/Cargo.toml

@@ -13,7 +13,7 @@ use syn::spanned::Spanned;
 /// # Examples
 ///
 /// ```ignore
-/// #[pyo3_asyncio::async_std::main]
+/// #[pyo3_asyncio_0_21::async_std::main]
 /// async fn main() -> PyResult<()> {
 ///     Ok(())
 /// }
@@ -52,7 +52,7 @@ pub fn async_std_main(_attr: TokenStream, item: TokenStream) -> TokenStream {
             pyo3::prepare_freethreaded_python();
 
             pyo3::Python::with_gil(|py| {
-                pyo3_asyncio::async_std::run(py, main())
+                pyo3_asyncio_0_21::async_std::run(py, main())
                     .map_err(|e| {
                         e.print_and_set_sys_last_vars(py);
                     })
@@ -74,23 +74,23 @@ pub fn async_std_main(_attr: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// Default configuration:
 /// ```ignore
-/// #[pyo3_asyncio::tokio::main]
+/// #[pyo3_asyncio_0_21::tokio::main]
 /// async fn main() -> PyResult<()> {
 ///     Ok(())
 /// }
 /// ```
 ///
 /// Current-thread scheduler:
 /// ```ignore
-/// #[pyo3_asyncio::tokio::main(flavor = "current_thread")]
+/// #[pyo3_asyncio_0_21::tokio::main(flavor = "current_thread")]
 /// async fn main() -> PyResult<()> {
 ///     Ok(())
 /// }
 /// ```
 ///
 /// Multi-thread scheduler with custom worker thread count:
 /// ```ignore
-/// #[pyo3_asyncio::tokio::main(flavor = "multi_thread", worker_threads = 10)]
+/// #[pyo3_asyncio_0_21::tokio::main(flavor = "multi_thread", worker_threads = 10)]
 /// async fn main() -> PyResult<()> {
 ///     Ok(())
 /// }
@@ -114,21 +114,21 @@ pub fn tokio_main(args: TokenStream, item: TokenStream) -> TokenStream {
 /// use pyo3::prelude::*;
 ///
 /// // async test function
-/// #[pyo3_asyncio::async_std::test]
+/// #[pyo3_asyncio_0_21::async_std::test]
 /// async fn test_async_sleep() -> PyResult<()> {
 ///     async_std::task::sleep(Duration::from_secs(1)).await;
 ///     Ok(())
 /// }
 ///
 /// // blocking test function
-/// #[pyo3_asyncio::async_std::test]
+/// #[pyo3_asyncio_0_21::async_std::test]
 /// fn test_blocking_sleep() -> PyResult<()> {
 ///     thread::sleep(Duration::from_secs(1));
 ///     Ok(())
 /// }
 ///
 /// // blocking test functions can optionally accept an event_loop parameter
-/// #[pyo3_asyncio::async_std::test]
+/// #[pyo3_asyncio_0_21::async_std::test]
 /// fn test_blocking_sleep_with_event_loop(event_loop: PyObject) -> PyResult<()> {
 ///     thread::sleep(Duration::from_secs(1));
 ///     Ok(())
@@ -148,16 +148,16 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
         // Optionally pass an event_loop parameter to blocking tasks
         let task = if sig.inputs.is_empty() {
             quote! {
-                Box::pin(pyo3_asyncio::async_std::re_exports::spawn_blocking(move || {
+                Box::pin(pyo3_asyncio_0_21::async_std::re_exports::spawn_blocking(move || {
                     #name()
                 }))
             }
         } else {
             quote! {
                 let event_loop = Python::with_gil(|py| {
-                    pyo3_asyncio::async_std::get_current_loop(py).unwrap().into()
+                    pyo3_asyncio_0_21::async_std::get_current_loop(py).unwrap().into()
                 });
-                Box::pin(pyo3_asyncio::async_std::re_exports::spawn_blocking(move || {
+                Box::pin(pyo3_asyncio_0_21::async_std::re_exports::spawn_blocking(move || {
                     #name(event_loop)
                 }))
             }
@@ -187,8 +187,8 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let result = quote! {
         #fn_impl
 
-        pyo3_asyncio::inventory::submit! {
-            pyo3_asyncio::testing::Test {
+        pyo3_asyncio_0_21::inventory::submit! {
+            pyo3_asyncio_0_21::testing::Test {
                 name: concat!(std::module_path!(), "::", stringify!(#name)),
                 test_fn: &#name
             }
@@ -211,21 +211,21 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
 /// use pyo3::prelude::*;
 ///
 /// // async test function
-/// #[pyo3_asyncio::tokio::test]
+/// #[pyo3_asyncio_0_21::tokio::test]
 /// async fn test_async_sleep() -> PyResult<()> {
 ///     tokio::time::sleep(Duration::from_secs(1)).await;
 ///     Ok(())
 /// }
 ///
 /// // blocking test function
-/// #[pyo3_asyncio::tokio::test]
+/// #[pyo3_asyncio_0_21::tokio::test]
 /// fn test_blocking_sleep() -> PyResult<()> {
 ///     thread::sleep(Duration::from_secs(1));
 ///     Ok(())
 /// }
 ///
 /// // blocking test functions can optionally accept an event_loop parameter
-/// #[pyo3_asyncio::tokio::test]
+/// #[pyo3_asyncio_0_21::tokio::test]
 /// fn test_blocking_sleep_with_event_loop(event_loop: PyObject) -> PyResult<()> {
 ///     thread::sleep(Duration::from_secs(1));
 ///     Ok(())
@@ -246,7 +246,7 @@ pub fn tokio_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
         let task = if sig.inputs.is_empty() {
             quote! {
                 Box::pin(async move {
-                    match pyo3_asyncio::tokio::get_runtime().spawn_blocking(move || #name()).await {
+                    match pyo3_asyncio_0_21::tokio::get_runtime().spawn_blocking(move || #name()).await {
                         Ok(result) => result,
                         Err(e) => {
                             assert!(e.is_panic());
@@ -258,18 +258,18 @@ pub fn tokio_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
                             } else {
                                 "unknown error".into()
                             };
-                            Err(pyo3_asyncio::err::RustPanic::new_err(format!("rust future panicked: {}", panic_message)))
+                            Err(pyo3_asyncio_0_21::err::RustPanic::new_err(format!("rust future panicked: {}", panic_message)))
                         }
                     }
                 })
             }
         } else {
             quote! {
                 let event_loop = Python::with_gil(|py| {
-                    pyo3_asyncio::tokio::get_current_loop(py).unwrap().into()
+                    pyo3_asyncio_0_21::tokio::get_current_loop(py).unwrap().into()
                 });
                 Box::pin(async move {
-                    match pyo3_asyncio::tokio::get_runtime().spawn_blocking(move || #name(event_loop)).await {
+                    match pyo3_asyncio_0_21::tokio::get_runtime().spawn_blocking(move || #name(event_loop)).await {
                         Ok(result) => result,
                         Err(e) => {
                             assert!(e.is_panic());
@@ -281,7 +281,7 @@ pub fn tokio_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
                             } else {
                                 "unknown error".into()
                             };
-                            Err(pyo3_asyncio::err::RustPanic::new_err(format!("rust future panicked: {}", panic_message)))
+                            Err(pyo3_asyncio_0_21::err::RustPanic::new_err(format!("rust future panicked: {}", panic_message)))
                         }
                     }
                 })
@@ -312,8 +312,8 @@ pub fn tokio_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let result = quote! {
         #fn_impl
 
-        pyo3_asyncio::inventory::submit! {
-            pyo3_asyncio::testing::Test {
+        pyo3_asyncio_0_21::inventory::submit! {
+            pyo3_asyncio_0_21::testing::Test {
                 name: concat!(std::module_path!(), "::", stringify!(#name)),
                 test_fn: &#name
             }

pyo3-asyncio-macros/src/lib.rs

@@ -151,7 +151,7 @@ fn parse_knobs(
         return Err(syn::Error::new_spanned(sig.fn_token, msg));
     }
 
-    let macro_name = "pyo3_asyncio::tokio::main";
+    let macro_name = "pyo3_asyncio_0_21::tokio::main";
     let mut config = Configuration::new(is_test, rt_multi_thread);
 
     for arg in args {
@@ -221,10 +221,10 @@ fn parse_knobs(
 
     let builder = match config.flavor {
         RuntimeFlavor::CurrentThread => quote! {
-            pyo3_asyncio::tokio::re_exports::runtime::Builder::new_current_thread()
+            pyo3_asyncio_0_21::tokio::re_exports::runtime::Builder::new_current_thread()
         },
         RuntimeFlavor::Threaded => quote! {
-            pyo3_asyncio::tokio::re_exports::runtime::Builder::new_multi_thread()
+            pyo3_asyncio_0_21::tokio::re_exports::runtime::Builder::new_multi_thread()
         },
     };
 
@@ -240,8 +240,8 @@ fn parse_knobs(
 
     let rt_init = match config.flavor {
         RuntimeFlavor::CurrentThread => quote! {
-            std::thread::spawn(|| pyo3_asyncio::tokio::get_runtime().block_on(
-                pyo3_asyncio::tokio::re_exports::pending::<()>()
+            std::thread::spawn(|| pyo3_asyncio_0_21::tokio::get_runtime().block_on(
+                pyo3_asyncio_0_21::tokio::re_exports::pending::<()>()
             ));
         },
         _ => quote! {},
@@ -259,12 +259,12 @@ fn parse_knobs(
             let mut builder = #builder;
             #builder_init;
 
-            pyo3_asyncio::tokio::init(builder);
+            pyo3_asyncio_0_21::tokio::init(builder);
 
             #rt_init
 
             pyo3::Python::with_gil(|py| {
-                pyo3_asyncio::tokio::run(py, main())
+                pyo3_asyncio_0_21::tokio::run(py, main())
                     .map_err(|e| {
                         e.print_and_set_sys_last_vars(py);
                     })

pyo3-asyncio-macros/src/tokio.rs

@@ -1,7 +1,7 @@
 use std::{thread, time::Duration};
 
 use pyo3::prelude::*;
-use pyo3_asyncio::TaskLocals;
+use pyo3_asyncio_0_21::TaskLocals;
 
 pub(super) const TEST_MOD: &'static str = r#"
 import asyncio
@@ -18,7 +18,7 @@ pub(super) async fn test_into_future(event_loop: PyObject) -> PyResult<()> {
         let test_mod =
             PyModule::from_code_bound(py, TEST_MOD, "test_rust_coroutine/test_mod.py", "test_mod")?;
 
-        pyo3_asyncio::into_future_with_locals(
+        pyo3_asyncio_0_21::into_future_with_locals(
             &TaskLocals::new(event_loop.into_bound(py)),
             test_mod.call_method1("py_sleep", (1.into_py(py),))?,
         )
@@ -48,7 +48,10 @@ pub(super) async fn test_other_awaitables(event_loop: PyObject) -> PyResult<()>
             ),
         )?;
 
-        pyo3_asyncio::into_future_with_locals(&TaskLocals::new(event_loop.into_bound(py)), task)
+        pyo3_asyncio_0_21::into_future_with_locals(
+            &TaskLocals::new(event_loop.into_bound(py)),
+            task,
+        )
     })?;
 
     fut.await?;