lima2.client 2.2.1__tar.gz → 2.2.2__tar.gz

{lima2_client-2.2.1/src/lima2_client.egg-info → lima2_client-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 2.2.1
+Version: 2.2.2
 Summary: Python client library for Lima2 detector
 Author: BCU (ESRF)
 License: Copyright (c) 2020-2024 Beamline Control Unit, ESRF
@@ -24,7 +24,7 @@ Requires-Dist: gevent
 Requires-Dist: jsonschema
 Requires-Dist: jsonschema-default
 Requires-Dist: beartype
-Requires-Dist: numpy
+Requires-Dist: numpy<2.3
 Requires-Dist: pyyaml
 Requires-Dist: typing-extensions
 Requires-Dist: h5py

{lima2_client-2.2.1 → lima2_client-2.2.2}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "jsonschema",
     "jsonschema-default",
     "beartype",
-    "numpy",
+    "numpy<2.3",          # CI runner (CentOS 7) has glibc2.17, numpy>=2.3 needs glibc2.28+
     "pyyaml",
     "typing-extensions",
     "h5py",

{lima2_client-2.2.1 → lima2_client-2.2.2}/src/lima2/client/client.py

@@ -299,7 +299,7 @@ class Client:
 
             cleared = []
             for uuid in receiver.pipelines:
-                if uuid != str(current):
+                if uuid != str(current) and all(self.pipeline(UUID(uuid)).is_finished):
                     logger.debug(
                         f"Erasing pipeline {uuid} from recv {receiver.dev_name()}"
                     )

{lima2_client-2.2.1 → lima2_client-2.2.2/src/lima2_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 2.2.1
+Version: 2.2.2
 Summary: Python client library for Lima2 detector
 Author: BCU (ESRF)
 License: Copyright (c) 2020-2024 Beamline Control Unit, ESRF
@@ -24,7 +24,7 @@ Requires-Dist: gevent
 Requires-Dist: jsonschema
 Requires-Dist: jsonschema-default
 Requires-Dist: beartype
-Requires-Dist: numpy
+Requires-Dist: numpy<2.3
 Requires-Dist: pyyaml
 Requires-Dist: typing-extensions
 Requires-Dist: h5py

{lima2_client-2.2.1 → lima2_client-2.2.2}/src/lima2_client.egg-info/requires.txt

@@ -3,7 +3,7 @@ gevent
 jsonschema
 jsonschema-default
 beartype
-numpy
+numpy<2.3
 pyyaml
 typing-extensions
 h5py

{lima2_client-2.2.1 → lima2_client-2.2.2}/tests/test_client.py

@@ -7,7 +7,7 @@
 
 from collections import namedtuple
 from unittest.mock import Mock
-from uuid import uuid1
+from uuid import UUID, uuid1
 
 import pytest
 import tango as tg
@@ -224,13 +224,20 @@ def test_erase_pipeline(server, database, monkeypatch):
     # Required to construct Client
     patch_properties(ctrl, {"receiver_topology": ["round_robin"]})
 
+    pipelines: dict[UUID, Pipeline] = {}
+
     # Tango-less mock for the Client.pipeline method
     def pipeline_no_db(client, uuid):
         if uuid in client.pipelines:
-            pipeline = Mock(spec=Pipeline)
-            pipeline.uuid = uuid
-            client._Client__pipelines[uuid] = pipeline
-            return pipeline
+            if uuid in pipelines:
+                return pipelines[uuid]
+            else:
+                pipeline = Mock(spec=Pipeline)
+                pipeline.uuid = uuid
+                pipeline.is_finished = [False, False]
+                client._Client__pipelines[uuid] = pipeline
+                pipelines[uuid] = pipeline
+                return pipeline
         else:
             raise ValueError(f"No pipeline {uuid}")
 
@@ -276,5 +283,14 @@ def test_erase_pipeline(server, database, monkeypatch):
     assert c.pipelines.sort() == [uuid_first, uuid_third, uuid_fourth].sort()
 
     c.clear_previous_pipelines()
+    # Not finished -> not cleared
+    assert set(c.pipelines) == set([uuid_first, uuid_third, uuid_fourth])
+
+    p3 = c.pipeline(uuid_third)
+    p3.is_finished = [True, True]
 
-    assert c.pipelines == [uuid_fourth]
+    p1 = c.pipeline(uuid_first)
+    p1.is_finished = [False, True]
+
+    c.clear_previous_pipelines()
+    assert set(c.pipelines) == set([uuid_first, uuid_fourth])