pychemstation 0.5.11__tar.gz → 0.5.12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. {pychemstation-0.5.11 → pychemstation-0.5.12}/PKG-INFO +1 -1
  2. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/controllers/table_controller.py +1 -1
  3. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/macro.py +2 -1
  4. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/method_types.py +3 -1
  5. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/table_types.py +2 -0
  6. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/tray_types.py +2 -0
  7. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation.egg-info/PKG-INFO +1 -1
  8. {pychemstation-0.5.11 → pychemstation-0.5.12}/setup.py +1 -1
  9. {pychemstation-0.5.11 → pychemstation-0.5.12}/LICENSE +0 -0
  10. {pychemstation-0.5.11 → pychemstation-0.5.12}/README.md +0 -0
  11. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/__init__.py +0 -0
  12. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/analysis/__init__.py +0 -0
  13. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/analysis/base_spectrum.py +0 -0
  14. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/analysis/spec_utils.py +0 -0
  15. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/analysis/utils.py +0 -0
  16. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/__init__.py +0 -0
  17. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/controllers/__init__.py +0 -0
  18. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/controllers/comm.py +0 -0
  19. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/controllers/method.py +0 -0
  20. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/controllers/sequence.py +0 -0
  21. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/control/hplc.py +0 -0
  22. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/generated/__init__.py +0 -0
  23. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/generated/dad_method.py +0 -0
  24. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/generated/pump_method.py +0 -0
  25. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/__init__.py +0 -0
  26. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/chromatogram.py +0 -0
  27. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/parsing.py +0 -0
  28. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation/utils/sequence_types.py +0 -0
  29. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation.egg-info/SOURCES.txt +0 -0
  30. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation.egg-info/dependency_links.txt +0 -0
  31. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation.egg-info/requires.txt +0 -0
  32. {pychemstation-0.5.11 → pychemstation-0.5.12}/pychemstation.egg-info/top_level.txt +0 -0
  33. {pychemstation-0.5.11 → pychemstation-0.5.12}/pyproject.toml +0 -0
  34. {pychemstation-0.5.11 → pychemstation-0.5.12}/setup.cfg +0 -0
  35. {pychemstation-0.5.11 → pychemstation-0.5.12}/tests/__init__.py +0 -0
  36. {pychemstation-0.5.11 → pychemstation-0.5.12}/tests/constants.py +0 -0
  37. {pychemstation-0.5.11 → pychemstation-0.5.12}/tests/test_comb.py +0 -0
  38. {pychemstation-0.5.11 → pychemstation-0.5.12}/tests/test_comm.py +0 -0
  39. {pychemstation-0.5.11 → pychemstation-0.5.12}/tests/test_method.py +0 -0
  40. {pychemstation-0.5.11 → pychemstation-0.5.12}/tests/test_sequence.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pychemstation
3
- Version: 0.5.11
3
+ Version: 0.5.12
4
4
  Summary: Library to interact with Chemstation software, primarily used in Hein lab
5
5
  Home-page: https://gitlab.com/heingroup/device-api/pychemstation
6
6
  Author: Lucy Hao
@@ -207,7 +207,7 @@ class TableController(abc.ABC):
207
207
  """
208
208
  timeout = 10 * 60
209
209
  if method:
210
- timeout = ((method.first_row.maximum_run_time + 5) * 60)
210
+ timeout = ((method.stop_time + method.post_time + 3) * 60)
211
211
  if sequence:
212
212
  timeout *= len(sequence.rows)
213
213
 
@@ -1,3 +1,5 @@
1
+ from __future__ import annotations
2
+
1
3
  from enum import Enum
2
4
  from typing import Union
3
5
  from dataclasses import dataclass
@@ -32,7 +34,6 @@ class Command(Enum):
32
34
  INSTRUMENT_OFF = 'macro "SHUTDOWN.MAC" ,go'
33
35
  INSTRUMENT_ON = 'LIDoOperation "TURN_ON"'
34
36
 
35
-
36
37
  GET_METHOD_CMD = "response$ = _MethFile$"
37
38
  GET_ROWS_CMD = 'response_num = TabHdrVal({register}, "{table_name}", "{col_name}")'
38
39
  SWITCH_METHOD_CMD = 'LoadMethod "{method_dir}", "{method_name}.M"'
@@ -1,3 +1,5 @@
1
+ from __future__ import annotations
2
+
1
3
  from dataclasses import dataclass
2
4
  from enum import Enum
3
5
  from typing import Union, Any, Optional
@@ -22,7 +24,7 @@ class Param:
22
24
  class HPLCMethodParams:
23
25
  organic_modifier: int
24
26
  flow: float
25
- pressure: Optional[float] = None #TODO: find this
27
+ pressure: Optional[float] = None # TODO: find this
26
28
 
27
29
 
28
30
  @dataclass
@@ -1,3 +1,5 @@
1
+ from __future__ import annotations
2
+
1
3
  from dataclasses import dataclass
2
4
  from enum import Enum
3
5
 
@@ -1,3 +1,5 @@
1
+ from __future__ import annotations
2
+
1
3
  from dataclasses import dataclass
2
4
  from enum import Enum
3
5
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pychemstation
3
- Version: 0.5.11
3
+ Version: 0.5.12
4
4
  Summary: Library to interact with Chemstation software, primarily used in Hein lab
5
5
  Home-page: https://gitlab.com/heingroup/device-api/pychemstation
6
6
  Author: Lucy Hao
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
5
5
 
6
6
  setuptools.setup(
7
7
  name="pychemstation",
8
- version="0.5.11",
8
+ version="0.5.12",
9
9
  author="Lucy Hao",
10
10
  author_email="lhao03@student.ubc.ca",
11
11
  description="Library to interact with Chemstation software, primarily used in Hein lab",
File without changes
File without changes
File without changes