openscvx 0.5.3.dev21__tar.gz → 0.5.3.dev22__tar.gz

{openscvx-0.5.3.dev21 → openscvx-0.5.3.dev22}/.github/workflows/tests-unit.yml

@@ -38,7 +38,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        uv pip install --system -e ".[gui,test]"
+        uv pip install --system -e ".[test]"
 
     - name: Run unit tests
       run: |

{openscvx-0.5.3.dev21/openscvx.egg-info → openscvx-0.5.3.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.5.3.dev21
+Version: 0.5.3.dev22
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pyyaml
 Requires-Dist: pydantic>=2.0
 Provides-Extra: cvxpygen
-Requires-Dist: cvxpygen; extra == "cvxpygen"
+Requires-Dist: cvxpygen>=1.0.0; extra == "cvxpygen"
 Requires-Dist: qocogen; extra == "cvxpygen"
 Provides-Extra: qpax
 Requires-Dist: qpax>=0.1.1; extra == "qpax"

{openscvx-0.5.3.dev21 → openscvx-0.5.3.dev22}/openscvx/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.5.3.dev21'
-__version_tuple__ = version_tuple = (0, 5, 3, 'dev21')
+__version__ = version = '0.5.3.dev22'
+__version_tuple__ = version_tuple = (0, 5, 3, 'dev22')
 
-__commit_id__ = commit_id = 'g5960b8809'
+__commit_id__ = commit_id = 'gc17dbce68'

{openscvx-0.5.3.dev21 → openscvx-0.5.3.dev22}/openscvx/solvers/cvxpy_ptr_solver.py

@@ -664,21 +664,24 @@ class CVXPyPTRSolver(PTRSolver):
         based on the configuration.
         """
         if self.cvxpygen:
+            cpg_solver_path = os.path.join("solver", "cpg_solver.py")
+            if not os.path.isfile(cpg_solver_path):
+                raise ImportError(
+                    "cvxpygen solver not found. Make sure cvxpygen is installed and code "
+                    "generation has been run. Install with: uv pip install openscvx[cvxpygen]"
+                )
             try:
-                import pickle
-
                 from solver.cpg_solver import cpg_solve
-
-                with open("solver/problem.pickle", "rb") as f:
-                    pickle.load(f)
-                self._problem.register_solve("CPG", cpg_solve)
-                solver_args = self.solver_args
-                self._solve_fn = lambda: self._problem.solve(method="CPG", **solver_args)
-            except ImportError:
+            except ImportError as exc:
                 raise ImportError(
                     "cvxpygen solver not found. Make sure cvxpygen is installed and code "
-                    "generation has been run. Install with: pip install openscvx[cvxpygen]"
-                )
+                    "generation has been run. Install with: uv pip install openscvx[cvxpygen]"
+                ) from exc
+            # cvxpygen v1.0+ registers CPG during generate_code(); re-register here so
+            # reusing an existing solver/ directory (without regenerating) still works.
+            self._problem.register_solve("CPG", cpg_solve)
+            solver_args = self.solver_args
+            self._solve_fn = lambda: self._problem.solve(method="CPG", **solver_args)
         else:
             solver = self.cvx_solver
             solver_args = dict(self.solver_args)
@@ -1200,7 +1203,9 @@ class CVXPyPTRSolver(PTRSolver):
             # status gate would otherwise reject the UNKNOWN it maps to.
             code = (
                 StatusCode.OPTIMAL
-                if result.status == "optimal_inaccurate"
+                if (result.status == "optimal_inaccurate")
+                or (result.status == "solved")
+                or (result.status == "1 (for description visit https://qoco-org.github.io/qoco/)")
                 else status_str_to_code(result.status)
             )
             return SubproblemSolution(

{openscvx-0.5.3.dev21 → openscvx-0.5.3.dev22/openscvx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.5.3.dev21
+Version: 0.5.3.dev22
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pyyaml
 Requires-Dist: pydantic>=2.0
 Provides-Extra: cvxpygen
-Requires-Dist: cvxpygen; extra == "cvxpygen"
+Requires-Dist: cvxpygen>=1.0.0; extra == "cvxpygen"
 Requires-Dist: qocogen; extra == "cvxpygen"
 Provides-Extra: qpax
 Requires-Dist: qpax>=0.1.1; extra == "qpax"

{openscvx-0.5.3.dev21 → openscvx-0.5.3.dev22}/openscvx.egg-info/requires.txt

@@ -13,7 +13,7 @@ pyyaml
 pydantic>=2.0
 
 [cvxpygen]
-cvxpygen
+cvxpygen>=1.0.0
 qocogen
 
 [lie]

{openscvx-0.5.3.dev21 → openscvx-0.5.3.dev22}/pyproject.toml

@@ -40,7 +40,7 @@ Homepage = "https://openscvx.github.io/OpenSCvx/"
 
 [project.optional-dependencies]
 cvxpygen = [
-    "cvxpygen",
+    "cvxpygen>=1.0.0",
     "qocogen",
 ]
 qpax = [