mx-bluesky 1.5.7__tar.gz → 1.5.8__tar.gz

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.7
+Version: 1.5.8
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -241,7 +241,7 @@ Requires-Dist: blueapi>=0.15.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.59.1
+Requires-Dist: dls-dodal==1.61.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.10.0a2",
     "bluesky >= 1.13.1",
-    "dls-dodal == 1.59.1",
+    "dls-dodal == 1.61.0",
 ]
 
 

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/src/mx_bluesky/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.7'
-__version_tuple__ = version_tuple = (1, 5, 7)
+__version__ = version = '1.5.8'
+__version_tuple__ = version_tuple = (1, 5, 8)
 
-__commit_id__ = commit_id = 'ge1f29265f'
+__commit_id__ = commit_id = 'gc6d1815ac'

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/src/mx_bluesky/beamlines/i04/thawing_plan.py

@@ -129,9 +129,9 @@ def thaw_and_murko_centre(
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
 
     sample_id = yield from bps.rd(robot.sample_id)
-    yield from bps.abs_set(murko_results.sample_id, int(sample_id))
+    yield from bps.mv(murko_results.sample_id, str(sample_id))
 
-    yield from bps.stage(murko_results)
+    yield from bps.stage(murko_results, wait=True)
     yield from bps.trigger(murko_results, group=MURKO_RESULTS_GROUP)
 
     yield from bpp.contingency_wrapper(
@@ -145,7 +145,7 @@ def thaw_and_murko_centre(
             oav_to_redis_forwarder,
             centre_then_switch_forwarder_to_ROI,
         ),
-        final_plan=partial(bps.unstage, murko_results),
+        final_plan=partial(bps.unstage, murko_results, wait=True),
     )
 
 

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/src/mx_bluesky.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.7
+Version: 1.5.8
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -241,7 +241,7 @@ Requires-Dist: blueapi>=0.15.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.59.1
+Requires-Dist: dls-dodal==1.61.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/src/mx_bluesky.egg-info/requires.txt

@@ -26,7 +26,7 @@ blueapi>=0.15.0
 ophyd>=1.10.5
 ophyd-async>=0.10.0a2
 bluesky>=1.13.1
-dls-dodal==1.59.1
+dls-dodal==1.61.0
 
 [dev]
 black

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/tests/unit_tests/beamlines/i04/test_redis_to_murko_forwarder.py

@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, call, patch
 
 import numpy as np
 import pytest
-from dodal.devices.i04.murko_results import MurkoResult
+from dodal.devices.i04.murko_results import MurkoMetadata, MurkoResult
 from PIL import Image
 
 from mx_bluesky.beamlines.i04.redis_to_murko_forwarder import (
@@ -81,8 +81,20 @@ def test_when_more_images_added_than_batch_size_then_murko_called(
 def test_when_results_sent_to_redis_then_set_on_multiple_keys_but_published_once(
     batch_forwarder: BatchMurkoForwarder,
 ):
-    result_1 = MurkoResult((0, 0), 0, 1, 2, "")
-    result_2 = MurkoResult((0, 0), 2, 3, 4, "")
+    example_metadata = MurkoMetadata(  # fields dont matter
+        zoom_percentage=1,
+        microns_per_x_pixel=1,
+        microns_per_y_pixel=1,
+        beam_centre_i=1,
+        beam_centre_j=1,
+        sample_id="1",
+        omega_angle=0,
+        uuid="any",
+        used_for_centring=None,
+    )
+
+    result_1 = MurkoResult((0, 0), 0, 1, 2, "", example_metadata)
+    result_2 = MurkoResult((0, 0), 2, 3, 4, "", example_metadata)
     results = [("uuid_1", result_1), ("uuid_2", result_2)]
     batch_forwarder._send_murko_results_to_redis("sample_id", results)
 

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/tests/unit_tests/beamlines/i04/test_thawing.py

@@ -487,7 +487,7 @@ def test_thaw_and_murko_centre_will_set_sample_id_before_triggering_results(
         msgs,
         lambda msg: msg.command == "set"
         and msg.obj.name == "murko_results-sample_id"
-        and msg.args[0] == 1234,
+        and msg.args[0] == "1234",
     )
     msgs = assert_message_and_return_remaining(
         msgs, lambda msg: msg.command == "trigger" and msg.obj.name == "murko_results"

{mx_bluesky-1.5.7 → mx_bluesky-1.5.8}/tests/unit_tests/beamlines/i24/jungfrau_commissioning/test_plan_utils.py

@@ -49,6 +49,9 @@ async def test_fly_jungfrau(
     assert mock_stop.await_count == 2  # once when staging, once after run complete
 
 
+@pytest.mark.skip(
+    reason="See https://github.com/DiamondLightSource/mx-bluesky/issues/1338"
+)
 def test_fly_jungfrau_stops_if_exception_after_stage(
     RE: RunEngine, jungfrau: CommissioningJungfrau
 ):