pychemstation 0.5.13.dev6__tar.gz → 0.5.13.dev7__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 (48) hide show
  1. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/PKG-INFO +1 -1
  2. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/tables/method.py +2 -2
  3. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/tables/table.py +3 -4
  4. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation.egg-info/PKG-INFO +1 -1
  5. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/setup.py +1 -1
  6. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/LICENSE +0 -0
  7. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/README.md +0 -0
  8. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/__init__.py +0 -0
  9. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/analysis/__init__.py +0 -0
  10. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/analysis/base_spectrum.py +0 -0
  11. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/analysis/spec_utils.py +0 -0
  12. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/analysis/utils.py +0 -0
  13. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/__init__.py +0 -0
  14. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/__init__.py +0 -0
  15. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/comm.py +0 -0
  16. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/devices/__init__.py +0 -0
  17. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/devices/column.py +0 -0
  18. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/devices/device.py +0 -0
  19. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/devices/pump.py +0 -0
  20. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/tables/__init__.py +0 -0
  21. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/tables/sequence.py +0 -0
  22. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/hplc.py +0 -0
  23. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/generated/__init__.py +0 -0
  24. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/generated/dad_method.py +0 -0
  25. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/generated/pump_method.py +0 -0
  26. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/__init__.py +0 -0
  27. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/chromatogram.py +0 -0
  28. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/injector_types.py +0 -0
  29. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/macro.py +0 -0
  30. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/method_types.py +0 -0
  31. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/parsing.py +0 -0
  32. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/pump_types.py +0 -0
  33. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/sequence_types.py +0 -0
  34. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/table_types.py +0 -0
  35. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/utils/tray_types.py +0 -0
  36. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation.egg-info/SOURCES.txt +0 -0
  37. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation.egg-info/dependency_links.txt +0 -0
  38. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation.egg-info/requires.txt +0 -0
  39. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation.egg-info/top_level.txt +0 -0
  40. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pyproject.toml +0 -0
  41. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/setup.cfg +0 -0
  42. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/__init__.py +0 -0
  43. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/constants.py +0 -0
  44. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/test_comb.py +0 -0
  45. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/test_comm.py +0 -0
  46. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/test_inj.py +0 -0
  47. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/test_method.py +0 -0
  48. {pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/tests/test_sequence.py +0 -0
{pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pychemstation
3
- Version: 0.5.13.dev6
3
+ Version: 0.5.13.dev7
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
{pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/tables/method.py RENAMED
@@ -316,7 +316,7 @@ class MethodController(TableController):
316
316
  folder_name = ""
317
317
  hplc_is_running = False
318
318
  tries = 0
319
- while not hplc_is_running and tries < 10:
319
+ while tries < 10 and not hplc_is_running:
320
320
  timestamp = time.strftime(TIME_FORMAT)
321
321
  self.send(Command.RUN_METHOD_CMD.value.format(data_dir=self.data_dir,
322
322
  experiment_name=experiment_name,
@@ -326,7 +326,7 @@ class MethodController(TableController):
326
326
  tries += 1
327
327
 
328
328
  if not hplc_is_running:
329
- raise RuntimeError
329
+ raise RuntimeError("Method failed to start.")
330
330
 
331
331
  self.data_files.append(os.path.join(self.data_dir, folder_name))
332
332
 
{pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation/control/controllers/tables/table.py RENAMED
@@ -11,11 +11,9 @@ from typing import Union, Optional
11
11
 
12
12
  import numpy as np
13
13
  import polling
14
- from polling import MaxCallException
14
+ import rainbow as rb
15
15
  from rainbow import DataFile
16
16
  from result import Result, Ok, Err
17
- import pandas as pd
18
- import rainbow as rb
19
17
 
20
18
  from ....control.controllers.comm import CommunicationController
21
19
  from ....utils.chromatogram import AgilentHPLCChromatogram, AgilentChannelChromatogramData
@@ -211,7 +209,8 @@ class TableController(abc.ABC):
211
209
  try:
212
210
  started_running = polling.poll(lambda: isinstance(self.controller.get_status(), HPLCRunningStatus),
213
211
  step=3, max_tries=10)
214
- except MaxCallException:
212
+ except Exception as e:
213
+ print(e)
215
214
  return False
216
215
  return started_running
217
216
 
{pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/pychemstation.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pychemstation
3
- Version: 0.5.13.dev6
3
+ Version: 0.5.13.dev7
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
{pychemstation-0.5.13.dev6 → pychemstation-0.5.13.dev7}/setup.py RENAMED
@@ -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.13.dev6",
8
+ version="0.5.13.dev7",
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",