Pyo3 0.18 upgrade (#88)

* feat: Initialize the Tokio runtime with a custom Tokio runtime

* Update pyo3 requirement from 0.17 to 0.18

Updates the requirements on [pyo3](https://github.com/pyo3/pyo3) to permit the latest version.
- [Release notes](https://github.com/pyo3/pyo3/releases)
- [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md)
- [Commits](PyO3/pyo3@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: pyo3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fixed warning, removed unnecessary allow(deprecated)

* Updated some more version numbers

* Marked local conversions as deprecated

* Pinned clap version for MSRV test

* Reverted tokio and clap versions to support MSRV

* Removed version pinning for clap since it's unnecessary

* Updating some github actions versions

* Upgraded rust toolchain action

* Removed unused args

* Added python version to setup-python action

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: rise0chen <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 3 people

.github/dependabot.yml

@@ -9,3 +9,6 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    allow:
+      - dependency-type: direct
+      - dependency-name: tokio # haven't been seeing updates for tokio

.github/workflows/ci.yml

@@ -15,13 +15,14 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
       - run: pip install black==22.8.0
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
           components: rustfmt
       - name: Check python formatting (black)
         run: black --check .
@@ -31,11 +32,10 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
           components: clippy
       - run: make clippy
 
@@ -114,21 +114,19 @@ jobs:
             extra_features: "nightly"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.platform.python-architecture }}
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.platform.rust-target }}
-          profile: minimal
-          default: true
 
       - if: matrix.platform.os == 'ubuntu-latest'
         name: Prepare LD_LIBRARY_PATH (Ubuntu only)
@@ -175,12 +173,11 @@ jobs:
     needs: [fmt]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly
           override: true
-          profile: minimal
       - name: Install pyo3-asyncio test dependencies
         run: |
           python -m pip install -U uvloop

.github/workflows/guide.yml

@@ -16,7 +16,7 @@ jobs:
     outputs:
       tag_name: ${{ steps.prepare_tag.outputs.tag_name }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
         # This adds the docs to gh-pages-build/doc
       - name: Build the doc
@@ -38,7 +38,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./gh-pages-build/
           destination_dir: ${{ steps.prepare_tag.outputs.tag_name }}
-          full_commit_message: 'Upload documentation for ${{ steps.prepare_tag.outputs.tag_name }}'
+          full_commit_message: "Upload documentation for ${{ steps.prepare_tag.outputs.tag_name }}"
 
   release:
     needs: deploy
@@ -57,5 +57,5 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public/
-          full_commit_message: 'Release ${{ needs.deploy.outputs.tag_name }}'
+          full_commit_message: "Release ${{ needs.deploy.outputs.tag_name }}"
           keep_files: true

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pyo3-asyncio"
 description = "PyO3 utilities for Python's Asyncio library"
-version = "0.17.0"
+version = "0.18.0"
 authors = ["Andrew J Westlake <[email protected]>"]
 readme = "README.md"
 keywords = ["pyo3", "python", "ffi", "async", "asyncio"]
@@ -116,11 +116,11 @@ futures = "0.3"
 inventory = { version = "0.3", optional = true }
 once_cell = "1.14"
 pin-project-lite = "0.2"
-pyo3 = "0.17"
-pyo3-asyncio-macros = { path = "pyo3-asyncio-macros", version = "=0.17.0", optional = true }
+pyo3 = "0.18"
+pyo3-asyncio-macros = { path = "pyo3-asyncio-macros", version = "=0.18.0", optional = true }
 
 [dev-dependencies]
-pyo3 = { version = "0.17", features = ["macros"] }
+pyo3 = { version = "0.18", features = ["macros"] }
 
 [dependencies.async-std]
 version = "1.12"
@@ -129,5 +129,5 @@ optional = true
 
 [dependencies.tokio]
 version = "1.13"
-features = ["full"]
+features = ["rt", "rt-multi-thread", "time"]
 optional = true

README.md

@@ -52,8 +52,8 @@ Here we initialize the runtime, import Python's `asyncio` library and run the gi
 ```toml
 # Cargo.toml dependencies
 [dependencies]
-pyo3 = { version = "0.17" }
-pyo3-asyncio = { version = "0.17", features = ["attributes", "async-std-runtime"] }
+pyo3 = { version = "0.18" }
+pyo3-asyncio = { version = "0.18", features = ["attributes", "async-std-runtime"] }
 async-std = "1.9"
 ```
 
@@ -82,8 +82,8 @@ attribute.
 ```toml
 # Cargo.toml dependencies
 [dependencies]
-pyo3 = { version = "0.17" }
-pyo3-asyncio = { version = "0.17", features = ["attributes", "tokio-runtime"] }
+pyo3 = { version = "0.18" }
+pyo3-asyncio = { version = "0.18", features = ["attributes", "tokio-runtime"] }
 tokio = "1.9"
 ```
 
@@ -127,17 +127,17 @@ For `async-std`:
 
 ```toml
 [dependencies]
-pyo3 = { version = "0.17", features = ["extension-module"] }
-pyo3-asyncio = { version = "0.17", features = ["async-std-runtime"] }
+pyo3 = { version = "0.18", features = ["extension-module"] }
+pyo3-asyncio = { version = "0.18", features = ["async-std-runtime"] }
 async-std = "1.9"
 ```
 
 For `tokio`:
 
 ```toml
 [dependencies]
-pyo3 = { version = "0.17", features = ["extension-module"] }
-pyo3-asyncio = { version = "0.17", features = ["tokio-runtime"] }
+pyo3 = { version = "0.18", features = ["extension-module"] }
+pyo3-asyncio = { version = "0.18", features = ["tokio-runtime"] }
 tokio = "1.9"
 ```
 
@@ -431,8 +431,8 @@ name = "my_async_module"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.17", features = ["extension-module"] }
-pyo3-asyncio = { version = "0.17", features = ["tokio-runtime"] }
+pyo3 = { version = "0.18", features = ["extension-module"] }
+pyo3-asyncio = { version = "0.18", features = ["tokio-runtime"] }
 async-std = "1.9"
 tokio = "1.9"
 ```
@@ -491,8 +491,8 @@ event loop before we can install the `uvloop` policy.
 ```toml
 [dependencies]
 async-std = "1.9"
-pyo3 = "0.17"
-pyo3-asyncio = { version = "0.17", features = ["async-std-runtime"] }
+pyo3 = "0.18"
+pyo3-asyncio = { version = "0.18", features = ["async-std-runtime"] }
 ```
 
 ```rust no_run

pyo3-asyncio-macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pyo3-asyncio-macros"
 description = "Proc Macro Attributes for PyO3 Asyncio"
-version = "0.17.0"
+version = "0.18.0"
 authors = ["Andrew J Westlake <[email protected]>"]
 readme = "../README.md"
 keywords = ["pyo3", "python", "ffi", "async", "asyncio"]

pytests/test_async_std_asyncio.rs

@@ -117,6 +117,7 @@ async fn test_local_future_into_py() -> PyResult<()> {
     Python::with_gil(|py| {
         let non_send_secs = Rc::new(1);
 
+        #[allow(deprecated)]
         let py_future = pyo3_asyncio::async_std::local_future_into_py(py, async move {
             async_std::task::sleep(Duration::from_secs(*non_send_secs)).await;
             Ok(())

pytests/tokio_asyncio/mod.rs

@@ -92,6 +92,7 @@ fn test_local_future_into_py(event_loop: PyObject) -> PyResult<()> {
         Python::with_gil(|py| {
             let non_send_secs = Rc::new(1);
 
+            #[allow(deprecated)]
             let py_future = pyo3_asyncio::tokio::local_future_into_py_with_locals(
                 py,
                 TaskLocals::new(event_loop.as_ref(py)),
@@ -175,6 +176,7 @@ async fn test_cancel() -> PyResult<()> {
 }
 
 #[pyo3_asyncio::tokio::test]
+#[allow(deprecated)]
 fn test_local_cancel(event_loop: PyObject) -> PyResult<()> {
     let locals = Python::with_gil(|py| -> PyResult<TaskLocals> {
         Ok(TaskLocals::new(event_loop.as_ref(py)).copy_context(py)?)
@@ -186,6 +188,8 @@ fn test_local_cancel(event_loop: PyObject) -> PyResult<()> {
             let completed = Arc::new(Mutex::new(false));
             let py_future = Python::with_gil(|py| -> PyResult<PyObject> {
                 let completed = Arc::clone(&completed);
+
+                #[allow(deprecated)]
                 Ok(pyo3_asyncio::tokio::local_future_into_py(py, async move {
                     tokio::time::sleep(Duration::from_secs(1)).await;
                     *completed.lock().unwrap() = true;

src/async_std.rs

@@ -9,7 +9,7 @@
 //!
 //! ```toml
 //! [dependencies.pyo3-asyncio]
-//! version = "0.17"
+//! version = "0.18"
 //! features = ["unstable-streams"]
 //! ```
 
@@ -379,6 +379,11 @@ where
 /// # #[cfg(not(all(feature = "async-std-runtime", feature = "attributes")))]
 /// # fn main() {}
 /// ```
+#[deprecated(
+    since = "0.18.0",
+    note = "Questionable whether these conversions have real-world utility (see https://github.com/awestlake87/pyo3-asyncio/issues/59#issuecomment-1008038497 and let me know if you disagree!)"
+)]
+#[allow(deprecated)]
 pub fn local_future_into_py_with_locals<F, T>(
     py: Python,
     locals: TaskLocals,
@@ -444,6 +449,11 @@ where
 /// # #[cfg(not(all(feature = "async-std-runtime", feature = "attributes")))]
 /// # fn main() {}
 /// ```
+#[deprecated(
+    since = "0.18.0",
+    note = "Questionable whether these conversions have real-world utility (see https://github.com/awestlake87/pyo3-asyncio/issues/59#issuecomment-1008038497 and let me know if you disagree!)"
+)]
+#[allow(deprecated)]
 pub fn local_future_into_py<F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<T>> + 'static,

src/generic.rs

@@ -9,7 +9,7 @@
 //!
 //! ```toml
 //! [dependencies.pyo3-asyncio]
-//! version = "0.17"
+//! version = "0.18"
 //! features = ["unstable-streams"]
 //! ```
 
@@ -29,7 +29,6 @@ use once_cell::sync::OnceCell;
 use pin_project_lite::pin_project;
 use pyo3::prelude::*;
 
-#[allow(deprecated)]
 use crate::{
     asyncio, call_soon_threadsafe, close, create_future, dump_err, err::RustPanic,
     get_running_loop, into_future_with_locals, TaskLocals,
@@ -930,6 +929,10 @@ where
 ///     )
 /// }
 /// ```
+#[deprecated(
+    since = "0.18.0",
+    note = "Questionable whether these conversions have real-world utility (see https://github.com/awestlake87/pyo3-asyncio/issues/59#issuecomment-1008038497 and let me know if you disagree!)"
+)]
 pub fn local_future_into_py_with_locals<R, F, T>(
     py: Python,
     locals: TaskLocals,
@@ -1119,6 +1122,11 @@ where
 ///     })
 /// }
 /// ```
+#[deprecated(
+    since = "0.18.0",
+    note = "Questionable whether these conversions have real-world utility (see https://github.com/awestlake87/pyo3-asyncio/issues/59#issuecomment-1008038497 and let me know if you disagree!)"
+)]
+#[allow(deprecated)]
 pub fn local_future_into_py<R, F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime + ContextExt + SpawnLocalExt + LocalContextExt,