pychemstation 0.6.5__tar.gz → 0.6.6__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 (50) hide show
  1. {pychemstation-0.6.5 → pychemstation-0.6.6}/PKG-INFO +1 -1
  2. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/hplc.py +7 -3
  3. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation.egg-info/PKG-INFO +1 -1
  4. {pychemstation-0.6.5 → pychemstation-0.6.6}/setup.py +1 -1
  5. {pychemstation-0.6.5 → pychemstation-0.6.6}/LICENSE +0 -0
  6. {pychemstation-0.6.5 → pychemstation-0.6.6}/README.md +0 -0
  7. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/__init__.py +0 -0
  8. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/analysis/__init__.py +0 -0
  9. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/analysis/base_spectrum.py +0 -0
  10. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/analysis/process_report.py +0 -0
  11. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/analysis/spec_utils.py +0 -0
  12. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/analysis/utils.py +0 -0
  13. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/__init__.py +0 -0
  14. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/__init__.py +0 -0
  15. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/comm.py +0 -0
  16. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/devices/__init__.py +0 -0
  17. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/devices/column.py +0 -0
  18. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/devices/dad.py +0 -0
  19. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/devices/device.py +0 -0
  20. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/devices/injector.py +0 -0
  21. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/devices/pump.py +0 -0
  22. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/tables/__init__.py +0 -0
  23. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/tables/method.py +0 -0
  24. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/tables/ms.py +0 -0
  25. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/tables/sequence.py +0 -0
  26. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/control/controllers/tables/table.py +0 -0
  27. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/generated/__init__.py +0 -0
  28. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/generated/dad_method.py +0 -0
  29. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/generated/pump_method.py +0 -0
  30. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/__init__.py +0 -0
  31. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/chromatogram.py +0 -0
  32. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/injector_types.py +0 -0
  33. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/macro.py +0 -0
  34. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/method_types.py +0 -0
  35. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/parsing.py +0 -0
  36. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/pump_types.py +0 -0
  37. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/sequence_types.py +0 -0
  38. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/table_types.py +0 -0
  39. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation/utils/tray_types.py +0 -0
  40. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation.egg-info/SOURCES.txt +0 -0
  41. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation.egg-info/dependency_links.txt +0 -0
  42. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation.egg-info/requires.txt +0 -0
  43. {pychemstation-0.6.5 → pychemstation-0.6.6}/pychemstation.egg-info/top_level.txt +0 -0
  44. {pychemstation-0.6.5 → pychemstation-0.6.6}/pyproject.toml +0 -0
  45. {pychemstation-0.6.5 → pychemstation-0.6.6}/setup.cfg +0 -0
  46. {pychemstation-0.6.5 → pychemstation-0.6.6}/tests/__init__.py +0 -0
  47. {pychemstation-0.6.5 → pychemstation-0.6.6}/tests/constants.py +0 -0
  48. {pychemstation-0.6.5 → pychemstation-0.6.6}/tests/test_nightly.py +0 -0
  49. {pychemstation-0.6.5 → pychemstation-0.6.6}/tests/test_runs_stable.py +0 -0
  50. {pychemstation-0.6.5 → pychemstation-0.6.6}/tests/test_stable.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pychemstation
3
- Version: 0.6.5
3
+ Version: 0.6.6
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
@@ -43,13 +43,17 @@ class HPLCController:
43
43
  data_dir: str,
44
44
  method_dir: str,
45
45
  sequence_dir: str,
46
- secondary_data_dir: Optional[str] = None,
46
+ sequence_data_dir: Optional[str] = None,
47
47
  offline: bool = False):
48
48
  """Initialize HPLC controller. The `hplc_talk.mac` macro file must be loaded in the Chemstation software.
49
49
  `comm_dir` must match the file path in the macro file.
50
50
 
51
51
  :param comm_dir: Name of directory for communication, where ChemStation will read and write from. Can be any existing directory.
52
- :raises FileNotFoundError: If either `data_dir`, `method_dir`, `sequence_dir`, or `comm_dir` is not a valid directory.
52
+ :param data_dir: Name of directory for storing data after method or sequence runs.
53
+ :param method_dir: Name of directory where method files are stored.
54
+ :param sequence_dir: Name of directory where sequence files are stored.
55
+ :param sequence_data_dir: Name of directory for storing sequence data, if different from method
56
+ :raises FileNotFoundError: If either `data_dir`, `method_dir`, `sequence_dir`, `sequence_data_dir`or `comm_dir` is not a valid directory.
53
57
  """
54
58
  self.comm = CommunicationController(comm_dir=comm_dir) if not offline else None
55
59
  self.method_controller = MethodController(controller=self.comm,
@@ -62,7 +66,7 @@ class HPLCController:
62
66
  offline=offline))
63
67
  self.sequence_controller = SequenceController(controller=self.comm,
64
68
  src=sequence_dir,
65
- data_dir=data_dir if not secondary_data_dir else secondary_data_dir,
69
+ data_dir=data_dir if not sequence_data_dir else sequence_data_dir,
66
70
  table=self.SEQUENCE_TABLE,
67
71
  method_dir=method_dir,
68
72
  offline=offline)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pychemstation
3
- Version: 0.6.5
3
+ Version: 0.6.6
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.6.5",
8
+ version="0.6.6",
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