processview 0.1.1b0__tar.gz → 0.1.2__tar.gz

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/core/manager/manager.py

@@ -126,7 +126,7 @@ class ProcessManager:
 
         :param BaseProcess process:
         """
-        if process.process_id in self._processes:
+        if process.process_id in self._processes and process.is_master_process:
             del self._processes[process.process_id]
 
     def get_processes(self) -> tuple:

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/core/manager/test/test_manager.py

@@ -33,6 +33,7 @@ from processview.core.superviseprocess import SuperviseProcess
 from processview.core.manager import ProcessManager
 from processview.core.manager import DatasetState
 from processview.core.dataset import Dataset
+from processview.core.dataset import DatasetIdentifier
 import gc
 
 
@@ -99,7 +100,10 @@ class TestProcessManager(unittest.TestCase):
         # test 'getProcessHistory'
         self.assertEqual(
             manager.get_process_history(process=p1),
-            ((str(scan_1), DatasetState.PENDING), (str(scan_2), DatasetState.SUCCEED)),
+            (
+                (scan_1.get_dataset_identifier(), DatasetState.PENDING),
+                (scan_2.get_dataset_identifier(), DatasetState.SUCCEED),
+            ),
         )
 
 
@@ -111,9 +115,24 @@ class _DummyScan(Dataset):
     def __str__(self) -> str:
         return self.name
 
-    def short_str(self):
+    def get_dataset_identifier(self) -> DatasetIdentifier:
+        return _DummyIdentifier(self)
+
+
+class _DummyIdentifier(DatasetIdentifier):
+    def __init__(self, dataset):
+        super().__init__(dataset)
+        self.name = dataset.name
+
+    def __str__(self):
         return self.name
 
+    def __eq__(self, other):
+        return self.name == other.name
+
+    def __hash__(self):
+        return hash(self.name)
+
 
 def suite():
     test_suite = unittest.TestSuite()

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/core/superviseprocess.py

@@ -63,6 +63,9 @@ class SuperviseProcess:
 
     def __init__(self, name=None, process_id=None):
         self._name = name
+        self._is_master_process = process_id is None
+        """is this process the master process of the SuperviseProcess. Or is
+        it just one of the underlying process of a master SuperviseProcess"""
         if process_id is None:
             ProcessManager().register(self)
         else:
@@ -71,6 +74,10 @@ class SuperviseProcess:
     def __del__(self):
         ProcessManager().unregister(self)
 
+    @property
+    def is_master_process(self):
+        return self._is_master_process
+
     @property
     def process_id(self):
         return self.__process_id

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/gui/processmanager.py

@@ -90,8 +90,6 @@ class ObservationTable(qt.QTableView):
     def contextMenuEvent(self, event):
         process = self._processAt(event.pos().x())
         dataset = self._datasetAt(event.pos().y())
-        print("process is", process)
-        print("data is", dataset)
         if _ProcessManager().met(process=process, dataset=dataset):
             self._target = (process, dataset)
             self.menu.exec_(event.globalPos())

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/gui/test/__init__.py

@@ -0,0 +1,38 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2017 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+
+__authors__ = ["H.Payno"]
+__license__ = "MIT"
+__date__ = "01/02/2021"
+
+import unittest
+
+from .test_process_manager import suite as test_process_manager_suite
+
+
+def suite():
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(test_process_manager_suite())
+    return test_suite

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/gui/test/test_process_manager.py

@@ -0,0 +1,108 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+
+__authors__ = ["H. Payno"]
+__license__ = "MIT"
+__date__ = "02/11/2020"
+
+
+import unittest
+from processview.core.superviseprocess import SuperviseProcess
+from processview.core.dataset import Dataset
+from processview.core.dataset import DatasetIdentifier
+from processview.gui.processmanager import ProcessManager
+from processview.core.manager import DatasetState
+from silx.gui.utils.testutils import SignalListener
+from silx.gui.utils.testutils import TestCaseQt
+import gc
+
+
+class TestProcessManager(TestCaseQt):
+    """
+    test ProcessManager
+    """
+
+    def setUp(self):
+        TestCaseQt.setUp(self)
+        self.signalListener = SignalListener()
+        self.manager = ProcessManager()
+        self.manager.sigUpdated.connect(self.signalListener)
+
+    def tearDown(self):
+        self.signalListener = None
+        self.processManager = None
+        gc.collect()
+        TestCaseQt.tearDown(self)
+
+    def testProcessStatesUpdate(self):
+        """insure providing states works well"""
+        p1 = SuperviseProcess()
+        p2 = SuperviseProcess()
+        scan_1 = _DummyScan("scan1")
+        scan_2 = _DummyScan("scan2")
+        self.manager.notify_dataset_state(
+            dataset=scan_1, state=DatasetState.PENDING, process=p1
+        )
+        self.manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.SUCCEED, process=p1
+        )
+        self.manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.FAILED, process=p2
+        )
+        self.assertEqual(self.signalListener.callCount(), 3)
+
+
+class _DummyScan(Dataset):
+    def __init__(self, name):
+        super().__init__()
+        self.name = name
+
+    def __str__(self) -> str:
+        return self.name
+
+    def get_dataset_identifier(self) -> DatasetIdentifier:
+        return _DummyIdentifier(self)
+
+
+class _DummyIdentifier(DatasetIdentifier):
+    def __init__(self, dataset):
+        super().__init__(dataset)
+        self.name = dataset.name
+
+    def __str__(self):
+        return self.name
+
+    def __eq__(self, other):
+        return self.name == other.name
+
+    def __hash__(self):
+        return hash(self.name)
+
+
+def suite():
+    test_suite = unittest.TestSuite()
+    for ui in (TestProcessManager,):
+        test_suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ui))
+    return test_suite

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/test/__init__.py

@@ -30,11 +30,13 @@ __date__ = "29/01/2021"
 
 import unittest
 from ..core import test as test_core
+from ..gui import test as test_gui
 
 
 def suite(loader=None):
     test_suite = unittest.TestSuite()
     test_suite.addTest(test_core.suite())
+    test_suite.addTest(test_gui.suite())
 
     return test_suite
 

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/version.py

@@ -77,9 +77,9 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 0
 MINOR = 1
-MICRO = 1
-RELEV = "rc"  # <16
-SERIAL = 0  # <16
+MICRO = 2
+RELEV = "final"  # <16
+SERIAL = 1  # <16
 
 date = __date__
 

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/{processview-0.1.1b0-py3.7.egg-info → processview-0.1.2-py3.7.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: processview
-Version: 0.1.1b0
+Version: 0.1.2
 Summary: Library workflow process supervision
 Home-page: https://gitlab.esrf.fr/workflow/processview
 Author: data analysis unit

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/{processview-0.1.1b0-py3.7.egg-info → processview-0.1.2-py3.7.egg-info}/SOURCES.txt

@@ -21,6 +21,8 @@ processview/core/test/__init__.py
 processview/gui/__init__.py
 processview/gui/icons.py
 processview/gui/processmanager.py
+processview/gui/test/__init__.py
+processview/gui/test/test_process_manager.py
 processview/resources/__init__.py
 processview/resources/gui/icons/advancement.png
 processview/resources/gui/icons/advancement.svg