pychemstation 0.7.0.dev1__tar.gz → 0.7.0.dev2__tar.gz

{pychemstation-0.7.0.dev1 → pychemstation-0.7.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.7.0.dev1
+Version: 0.7.0.dev2
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao

{pychemstation-0.7.0.dev1 → pychemstation-0.7.0.dev2}/pychemstation/control/controllers/tables/sequence.py

@@ -192,18 +192,15 @@ class SequenceController(TableController):
     def get_data(self, custom_path: Optional[str] = None,
                  read_uv: bool = False) -> list[AgilentChannelChromatogramData]:
         parent_dir = self.data_files[-1].dir if not custom_path else custom_path
-        child_dirs = self.data_files[-1].child_dirs
-        if len(child_dirs) == 0:
-            subdirs = []
-            for d in self.data_dirs:
+
+        potential_folders = []
+        for d in self.data_dirs:
                 subdirs = [x[0] for x in os.walk(d)]
-                if len(subdirs) > 0:
+                potential_folders = sorted(list(filter(lambda d: parent_dir in d, subdirs)))
+                if len(potential_folders) > 0:
                     break
-            assert len(subdirs) > 0
-            potential_folders = sorted(list(filter(lambda d: parent_dir in d, subdirs)))
-            self.data_files[-1].child_dirs = [f for f in potential_folders if
-                                              parent_dir in f and ".M" not in f and ".D" in f]
-
+        assert len(potential_folders) > 0
+        self.data_files[-1].child_dirs = [f for f in potential_folders if parent_dir in f and ".M" not in f and ".D" in f]
         spectra: list[Union[AgilentChannelChromatogramData, ChromData]] = []
         all_w_spectra: list[Union[AgilentChannelChromatogramData, ChromData]] = []
         for row in self.data_files[-1].child_dirs:

{pychemstation-0.7.0.dev1 → pychemstation-0.7.0.dev2}/pychemstation/control/controllers/tables/table.py

@@ -258,13 +258,13 @@ class TableController(abc.ABC):
         if os.path.exists(most_recent_folder):
             return Ok(most_recent_folder)
 
-        subdirs = []
+        potential_folders = []
         for d in self.data_dirs:
             subdirs = [x[0] for x in os.walk(d)]
-            if len(subdirs) > 0:
+            potential_folders = sorted(list(filter(lambda d: most_recent_folder in d, subdirs)))
+            if len(potential_folders) > 0:
                 break
-        assert len(subdirs) > 0
-        potential_folders = sorted(list(filter(lambda d: most_recent_folder in d, subdirs)))
+        assert len(potential_folders) > 0
         parent_dirs = []
         for folder in potential_folders:
             path = os.path.normpath(folder)

{pychemstation-0.7.0.dev1 → pychemstation-0.7.0.dev2}/pychemstation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.7.0.dev1
+Version: 0.7.0.dev2
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao

{pychemstation-0.7.0.dev1 → pychemstation-0.7.0.dev2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pychemstation",
-    version="0.7.0.dev1",
+    version="0.7.0.dev2",
     author="Lucy Hao",
     author_email="lhao03@student.ubc.ca",
     description="Library to interact with Chemstation software, primarily used in Hein lab",

{pychemstation-0.7.0.dev1 → pychemstation-0.7.0.dev2}/tests/test_stable.py

@@ -52,14 +52,6 @@ class TestStable(unittest.TestCase):
         except Exception as e:
             self.fail(f"Should not throw error: {e}")
 
-    def test_load_method_from_disk(self):
-        self.hplc_controller.switch_method(DEFAULT_METHOD)
-        try:
-            gp_mtd = self.hplc_controller.method_controller.load_from_disk(DEFAULT_METHOD)
-            self.assertTrue(gp_mtd.params.organic_modifier == 5)
-        except Exception as e:
-            self.fail(f"Should have not failed, {e}")
-
     def test_edit_method(self):
         self.hplc_controller.method_controller.switch(DEFAULT_METHOD)
         new_method = MethodDetails(name=DEFAULT_METHOD + ".M",
@@ -273,6 +265,7 @@ class TestStable(unittest.TestCase):
             check_folder = self.hplc_controller.sequence_controller.fuzzy_match_most_recent_folder(
                 most_recent_folder=most_recent_folder)
             self.assertEqual(check_folder.ok_value, path)
+            self.hplc_controller.sequence_controller.data_files[-1].dir = check_folder.ok_value
             chrom = self.hplc_controller.get_last_run_sequence_data()
             self.assertTrue(chrom)
         except Exception: