chore(deps): bump pyo3 from 0.25.1 to 0.28.3

pumpkin-solver-py/Cargo.toml

@@ -16,7 +16,7 @@ crate-type = ["cdylib"]
 doc = false
 
 [dependencies]
-pyo3 = { version = "0.25.1", features= ["extension-module"] }
+pyo3 = { version = "0.28.3", features= ["extension-module"] }
 pumpkin-solver = { version = "0.3.0", path = "../pumpkin-solver" }
 pumpkin-constraints = { version = "0.3.0", path = "../pumpkin-crates/constraints", features=["clap"] }
 pumpkin-conflict-resolvers = { version = "0.3.0", path = "../pumpkin-crates/conflict-resolvers/"}

pumpkin-solver-py/src/constraints/globals.rs

@@ -7,7 +7,7 @@ use crate::variables::*;
 
 macro_rules! python_constraint {
     ($name:ident : $constraint_func:ident { $($field:ident : $type:ty),+ $(,)? }) => {
-        #[pyclass]
+        #[pyclass(from_py_object)]
         #[derive(Clone)]
         pub(crate) struct $name {
             constraint_tag: Tag,

pumpkin-solver-py/src/model.rs

@@ -42,7 +42,7 @@ pub struct Model {
     brancher: PythonBrancher,
 }
 
-#[pyclass]
+#[pyclass(from_py_object)]
 #[derive(Clone, Debug)]
 pub struct Tag(pub ConstraintTag);
 

pumpkin-solver-py/src/optimisation.rs

@@ -2,7 +2,8 @@ use pyo3::prelude::*;
 
 use crate::result::Solution;
 
-#[pyclass]
+#[pyclass(from_py_object)]
+#[derive(Clone)]
 pub enum OptimisationResult {
     /// The problem was solved to optimality, and the solution is an optimal one.
     Optimal(Solution),
@@ -14,14 +15,14 @@ pub enum OptimisationResult {
     Unknown(),
 }
 
-#[pyclass(eq, eq_int)]
+#[pyclass(eq, eq_int, from_py_object)]
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum Optimiser {
     LinearSatUnsat,
     LinearUnsatSat,
 }
 
-#[pyclass(eq, eq_int)]
+#[pyclass(eq, eq_int, from_py_object)]
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum Direction {
     Minimise,

pumpkin-solver-py/src/result.rs

@@ -5,24 +5,26 @@ use crate::variables::BoolExpression;
 use crate::variables::IntExpression;
 use crate::variables::Predicate;
 
-#[pyclass]
+#[pyclass(from_py_object)]
 #[allow(clippy::large_enum_variant)]
+#[derive(Clone)]
 pub enum SatisfactionResult {
     Satisfiable(Solution),
     Unsatisfiable(),
     Unknown(),
 }
 
-#[pyclass]
+#[pyclass(from_py_object)]
 #[allow(clippy::large_enum_variant)]
+#[derive(Clone)]
 pub enum SatisfactionUnderAssumptionsResult {
     Satisfiable(Solution),
     UnsatisfiableUnderAssumptions(Vec<Predicate>),
     Unsatisfiable(),
     Unknown(),
 }
 
-#[pyclass]
+#[pyclass(from_py_object)]
 #[derive(Clone)]
 pub struct Solution(pumpkin_solver::core::results::Solution);
 

pumpkin-solver-py/src/variables.rs

@@ -5,7 +5,7 @@ use pumpkin_solver::core::variables::Literal;
 use pumpkin_solver::core::variables::TransformableVariable;
 use pyo3::prelude::*;
 
-#[pyclass(eq, hash, frozen)]
+#[pyclass(eq, hash, frozen, from_py_object)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct IntExpression(pub AffineView<DomainId>);
 
@@ -26,7 +26,7 @@ impl IntExpression {
     }
 }
 
-#[pyclass(eq, hash, frozen)]
+#[pyclass(eq, hash, frozen, from_py_object)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct BoolExpression(pub Literal);
 
@@ -47,7 +47,7 @@ impl From<Literal> for BoolExpression {
     }
 }
 
-#[pyclass(eq, eq_int, hash, frozen)]
+#[pyclass(eq, eq_int, hash, frozen, from_py_object)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum Comparator {
     NotEqual,
@@ -56,7 +56,7 @@ pub enum Comparator {
     GreaterThanOrEqual,
 }
 
-#[pyclass(eq, get_all, hash, frozen)]
+#[pyclass(eq, get_all, hash, frozen, from_py_object)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct Predicate {
     pub variable: IntExpression,