Merge pull request #10 from awestlake87/attributes

Adding #[main] and #[test] attributes (issue #9)

Author: awestlake87

Cargo.toml

@@ -12,20 +12,42 @@ license = "Apache-2.0"
 exclude = ["/.gitignore", "/codecov.yml", "/Makefile"]
 edition = "2018"
 
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[workspace]
+members = ["pyo3-asyncio-macros"]
 
 [features]
 async-std-runtime = ["async-std"]
+attributes = ["pyo3-asyncio-macros"]
 testing = ["clap"]
 tokio-runtime = ["tokio"]
 default = []
 
+[[example]]
+name = "async_std"
+path = "examples/async_std.rs"
+required-features = ["attributes", "async-std-runtime"]
+
+[[example]]
+name = "tokio"
+path = "examples/tokio.rs"
+required-features = ["attributes", "tokio-runtime"]
+
+[[example]]
+name = "tokio_current_thread"
+path = "examples/tokio_current_thread.rs"
+required-features = ["attributes", "tokio-runtime"]
+
+[[example]]
+name = "tokio_multi_thread"
+path = "examples/tokio_multi_thread.rs"
+required-features = ["attributes", "tokio-runtime"]
+
+
 [[test]]
 name = "test_async_std_asyncio"
 path = "pytests/test_async_std_asyncio.rs"
 harness = false
-required-features = ["async-std-runtime", "testing"]
+required-features = ["async-std-runtime", "testing", "attributes"]
 
 [[test]]
 name = "test_async_std_run_forever"
@@ -37,7 +59,7 @@ required-features = ["async-std-runtime", "testing"]
 name = "test_tokio_current_thread_asyncio"
 path = "pytests/test_tokio_current_thread_asyncio.rs"
 harness = false
-required-features = ["tokio-runtime", "testing"]
+required-features = ["tokio-runtime", "testing", "attributes"]
 
 [[test]]
 name = "test_tokio_current_thread_run_forever"
@@ -49,7 +71,7 @@ required-features = ["tokio-runtime", "testing"]
 name = "test_tokio_multi_thread_asyncio"
 path = "pytests/test_tokio_multi_thread_asyncio.rs"
 harness = false
-required-features = ["tokio-runtime", "testing"]
+required-features = ["tokio-runtime", "testing", "attributes"]
 
 [[test]]
 name = "test_tokio_multi_thread_run_forever"
@@ -60,9 +82,11 @@ required-features = ["tokio-runtime", "testing"]
 [dependencies]
 clap = { version = "2.33", optional = true }
 futures = "0.3"
+inventory = "0.1"
 lazy_static = "1.4"
 once_cell = "1.5"
 pyo3 = "0.13"
+pyo3-asyncio-macros = { path = "pyo3-asyncio-macros", version = "=0.13.0", optional = true }
 
 [dependencies.async-std]
 version = "1.9"

Makefile

@@ -14,5 +14,9 @@ lint: fmt clippy
 test: lint
 	cargo test --all-features
 
-publish: test
+test-feature-powerset:
+	cargo install cargo-hack
+	cargo hack test --feature-powerset	
+
+publish: test-feature-powerset
 	cargo publish

README.md

@@ -28,39 +28,20 @@ Here we initialize the runtime, import Python's `asyncio` library and run the gi
 
 More details on the usage of this library can be found in the [API docs](https://awestlake87.github.io/pyo3-asyncio/master/doc).
 
-```rust no_run
+```rust
 use pyo3::prelude::*;
 
-fn main() {
-    Python::with_gil(|py| {
-        // Initialize the runtime
-        pyo3_asyncio::with_runtime(py, || {
-            let asyncio: PyObject = py.import("asyncio")?.into();
-            
-            // Run the event loop until the given future completes
-            pyo3_asyncio::async_std::run_until_complete(py, async move {
-                Python::with_gil(|py| {
-                    // convert asyncio.sleep into a Rust Future
-                    pyo3_asyncio::into_future(
-                        asyncio.call_method1(
-                            py, 
-                            "sleep", 
-                            (1.into_py(py),)
-                        )?
-                        .as_ref(py)
-                    )
-                })?
-                .await?;
-
-                Ok(())
-            })?;
-
-            Ok(())
-        })
-        .map_err(|e| {
-            e.print_and_set_sys_last_vars(py);  
-        })
-        .unwrap();
-    })
+#[pyo3_asyncio::async_std::main]
+async fn main() -> PyResult<()> {
+    let fut = Python::with_gil(|py| {
+        let asyncio = py.import("asyncio")?;
+
+        // convert asyncio.sleep into a Rust Future
+        pyo3_asyncio::into_future(asyncio.call_method1("sleep", (1.into_py(py),))?)
+    })?;
+
+    fut.await?;
+
+    Ok(())
 }
 ```

examples/async_std.rs

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

examples/tokio.rs

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

examples/tokio_current_thread.rs

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

examples/tokio_multi_thread.rs

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

pyo3-asyncio-macros/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "pyo3-asyncio-macros"
+version = "0.13.0"
+authors = ["Andrew J Westlake <[email protected]>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0"
+quote = "1"
+syn = { version = "1", features = ["full"] }