chore(deps): bump pyo3 to 0.23.3

chrjabs · Dec 11, 2024 · 801e272 · 801e272
1 parent c69e378
commit 801e272
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pyapi/Cargo.toml b/pyapi/Cargo.toml
@@ -15,14 +15,14 @@ build = "build.rs"
 
 [dependencies]
 rustsat.workspace = true
-pyo3 = { version = "0.22.5", features = [
+pyo3 = { version = "0.23.3", features = [
   "extension-module",
   "abi3",
   "abi3-py37",
 ] }
 
 [build-dependencies]
-pyo3-build-config = { version = "0.22.2" }
+pyo3-build-config = { version = "0.23.3" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/pyapi/src/lib.rs b/pyapi/src/lib.rs
@@ -28,23 +28,12 @@ use crate::{
     types::{Clause, Lit},
 };
 
+#[derive(IntoPyObject)]
 pub(crate) enum SingleOrList<T> {
     Single(T),
     List(Vec<T>),
 }
 
-impl<T> IntoPy<PyObject> for SingleOrList<T>
-where
-    T: IntoPy<PyObject>,
-{
-    fn into_py(self, py: Python<'_>) -> PyObject {
-        match self {
-            SingleOrList::Single(single) => single.into_py(py),
-            SingleOrList::List(list) => list.into_py(py),
-        }
-    }
-}
-
 /// Python bindings for the RustSAT library
 #[pymodule]
 fn rustsat(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
@@ -53,14 +42,14 @@ fn rustsat(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<Cnf>()?;
     m.add_class::<VarManager>()?;
 
-    let encodings = PyModule::new_bound(py, "rustsat.encodings")?;
+    let encodings = PyModule::new(py, "rustsat.encodings")?;
     encodings.add_class::<Totalizer>()?;
     encodings.add_class::<GeneralizedTotalizer>()?;
     encodings.add_class::<DynamicPolyWatchdog>()?;
     m.add("encodings", &encodings)?;
 
     // To import encodings. Fix from https://github.com/PyO3/pyo3/issues/759
-    py.import_bound("sys")?
+    py.import("sys")?
         .getattr("modules")?
         .set_item("rustsat.encodings", &encodings)?;