From 3be44fa6017fa3a9e5e142f5d730a29aa56a1a9d Mon Sep 17 00:00:00 2001
From: Frederike Duembgen <frederike.duembgen@gmail.com>
Date: Fri, 29 Dec 2023 15:32:52 -0500
Subject: [PATCH] Move chompack to pip

---
 _test/test_parameters.py      | 6 +++---
 environment.yml               | 2 +-
 lifters/robust_pose_lifter.py | 2 +-
 lifters/state_lifter.py       | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/_test/test_parameters.py b/_test/test_parameters.py
index 5f09cda..9db6549 100644
--- a/_test/test_parameters.py
+++ b/_test/test_parameters.py
@@ -15,10 +15,10 @@ def test_canonical_operations():
     Ai_sub = np.array(
         [
             [1, 0, 0, 0, 0, 0],
-            [0, 0,.5, 0, 0, 0],
-            [0,.5, 0, 0,.5, 0],
+            [0, 0, .5, 0, 0, 0],
+            [0, .5, 0, 0, .5, 0],
             [0, 0, 0, 1, 0, 0],
-            [0, 0,.5, 0, 0, 0],
+            [0, 0, .5, 0, 0, 0],
             [0, 0, 0, 0, 0, 0],
         ]
     )
diff --git a/environment.yml b/environment.yml
index 6cd45fb..f80698f 100644
--- a/environment.yml
+++ b/environment.yml
@@ -23,9 +23,9 @@ dependencies:
     - mosek
     - tbb=2020.2 # sparseqr conflict
     - autograd>=1.6.2
-    - chompack>=2.3.3
 
     - pip:
+      - chompack>=2.3.3
       - pymanopt>=2.1.1
       - sparseqr
       - asrl-pylgmath>=1.0.3
diff --git a/lifters/robust_pose_lifter.py b/lifters/robust_pose_lifter.py
index 99c02bb..3b06880 100644
--- a/lifters/robust_pose_lifter.py
+++ b/lifters/robust_pose_lifter.py
@@ -258,7 +258,7 @@ def get_cost(self, theta, y):
 
         try:
             R, t = get_C_r_from_theta(x, self.d)
-        except:
+        except Exception:
             R, t = get_C_r_from_xtheta(x, self.d)
 
         cost = 0
diff --git a/lifters/state_lifter.py b/lifters/state_lifter.py
index 1607e7c..d537dd6 100644
--- a/lifters/state_lifter.py
+++ b/lifters/state_lifter.py
@@ -592,7 +592,6 @@ def convert_b_to_polyrow(self, b, var_subset, tol=1e-10) -> PolyMatrix:
             poly_row["h", key] = val
         return poly_row
 
-
     def apply_templates(self, basis_list, n_landmarks=None, verbose=False):
         """
         Apply the learned patterns in basis_list to all landmarks.