Merge pull request #64 from kevinheavey/pyo3-19

Use PyO3 v0.19.2
kevinheavey · Aug 12, 2023 · 1c60503 · 1c60503
2 parents 27340c2 + 5dfcea0
commit 1c60503
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Changed
+
+- Use PyO3 v0.19.2 [(#64)](https://github.com/kevinheavey/solders/pull/64)
+
 ## [0.19.0] - 2023-07-31
 
 - Add Token Program ID (`solders.token.ID`)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -62,7 +62,7 @@ license = "MIT"
 edition = "2021"
 
 [workspace.dependencies]
-pyo3 = { version = "0.18.0", default-features = false }
+pyo3 = { version = "0.19.2", default-features = false }
 solders-macros = { path = "./crates/macros", version = "=0.18.1" }
 solders-traits = { path = "./crates/traits", version = "=0.18.1" }
 solders-traits-core = { path = "./crates/traits-core", version = "=0.18.1" }
@@ -131,7 +131,7 @@ serde_cbor = "^0.11.2"
 derive_more = "0.99.17"
 solana-program-test = "1.16.0"
 solana-banks-client = "1.16.0"
-pythonize = "0.18.0"
+pythonize = "0.19.0"
 bs58 = "0.4.0"
 thiserror = "^1.0.31"
 camelpaste = "0.1.0"
diff --git a/crates/bankrun/Cargo.toml b/crates/bankrun/Cargo.toml
@@ -29,4 +29,4 @@ solana-program-test = { workspace = true }
 solana-banks-client = { workspace = true }
 tarpc = { version = "0.29.0" }
 toml = "0.7.3"
-pyo3-asyncio = { version = "0.18.0", features = ["tokio-runtime"] }
+pyo3-asyncio = { version = "0.19.0", features = ["tokio-runtime"] }
diff --git a/crates/rpc-requests/src/lib.rs b/crates/rpc-requests/src/lib.rs
@@ -2808,9 +2808,7 @@ pub fn batch_to_json(reqs: Vec<Body>) -> String {
 ///     }]
 ///
 #[pyfunction]
-pub fn batch_from_json(raw: &str) -> PyResult<Vec<PyObject>> {
-    let gil = Python::acquire_gil();
-    let py = gil.python();
+pub fn batch_from_json(py: Python<'_>, raw: &str) -> PyResult<Vec<PyObject>> {
     let deser: Vec<Body> = serde_json::from_str(raw).unwrap();
     Ok(deser.into_iter().map(|x| x.into_py(py)).collect())
 }