pychemstation 0.5.10__tar.gz → 0.5.12__tar.gz

{pychemstation-0.5.10 → pychemstation-0.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.10
+Version: 0.5.12
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao
@@ -13,6 +13,7 @@ License-File: LICENSE
 Requires-Dist: polling
 Requires-Dist: seabreeze
 Requires-Dist: xsdata
+Requires-Dist: result
 
 # Agilent HPLC Macro Control
 

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation/control/controllers/sequence.py

@@ -1,15 +1,14 @@
-from typing import Optional
-
 import os
 import time
+from typing import Optional
 
-from ...control.controllers.table_controller import TableController
 from ...control.controllers.comm import CommunicationController
+from ...control.controllers.table_controller import TableController
 from ...utils.chromatogram import SEQUENCE_TIME_FORMAT, AgilentChannelChromatogramData
 from ...utils.macro import Command
 from ...utils.sequence_types import SequenceTable, SequenceEntry, SequenceDataFiles, InjectionSource, SampleType
-from ...utils.table_types import TableOperation, RegisterFlag, Table
-from ...utils.tray_types import TenColumn
+from ...utils.table_types import RegisterFlag, Table
+from ...utils.tray_types import TenVialColumn
 
 
 class SequenceController(TableController):
@@ -118,7 +117,7 @@ class SequenceController(TableController):
 
         if row.vial_location:
             loc = row.vial_location
-            if isinstance(row.vial_location, TenColumn):
+            if isinstance(row.vial_location, TenVialColumn):
                 loc = row.vial_location.value
             self.edit_row_num(row=row_num, col_name=RegisterFlag.VIAL_LOCATION, val=loc)
 

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation/control/controllers/table_controller.py

@@ -207,7 +207,7 @@ class TableController(abc.ABC):
         """
         timeout = 10 * 60
         if method:
-            timeout = ((method.first_row.maximum_run_time + 5) * 60)
+            timeout = ((method.stop_time + method.post_time + 3) * 60)
         if sequence:
             timeout *= len(sequence.rows)
 

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation/utils/macro.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Union
 from dataclasses import dataclass
@@ -32,7 +34,6 @@ class Command(Enum):
     INSTRUMENT_OFF = 'macro "SHUTDOWN.MAC" ,go'
     INSTRUMENT_ON = 'LIDoOperation "TURN_ON"'
 
-
     GET_METHOD_CMD = "response$ = _MethFile$"
     GET_ROWS_CMD = 'response_num = TabHdrVal({register}, "{table_name}", "{col_name}")'
     SWITCH_METHOD_CMD = 'LoadMethod "{method_dir}", "{method_name}.M"'

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation/utils/method_types.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
 from typing import Union, Any, Optional
@@ -22,7 +24,7 @@ class Param:
 class HPLCMethodParams:
     organic_modifier: int
     flow: float
-    pressure: Optional[float] = None #TODO: find this
+    pressure: Optional[float] = None  # TODO: find this
 
 
 @dataclass

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation/utils/table_types.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
 

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation/utils/tray_types.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
 

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.10
+Version: 0.5.12
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao
@@ -13,6 +13,7 @@ License-File: LICENSE
 Requires-Dist: polling
 Requires-Dist: seabreeze
 Requires-Dist: xsdata
+Requires-Dist: result
 
 # Agilent HPLC Macro Control
 

{pychemstation-0.5.10 → pychemstation-0.5.12}/pychemstation.egg-info/requires.txt

@@ -1,3 +1,4 @@
 polling
 seabreeze
 xsdata
+result

{pychemstation-0.5.10 → pychemstation-0.5.12}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pychemstation",
-    version="0.5.10",
+    version="0.5.12",
     author="Lucy Hao",
     author_email="lhao03@student.ubc.ca",
     description="Library to interact with Chemstation software, primarily used in Hein lab",
@@ -16,7 +16,8 @@ setuptools.setup(
     install_requires=[
         'polling',
         'seabreeze',
-        'xsdata'
+        'xsdata',
+        'result'
     ],
     classifiers=[
         "Programming Language :: Python :: 3",