ophyd-async 0.10.0a1__py3-none-any.whl → 0.10.0a2__py3-none-any.whl

ophyd_async/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.10.0a1'
+__version__ = version = '0.10.0a2'
 __version_tuple__ = version_tuple = (0, 10, 0)

ophyd_async/core/_derived_signal.py

@@ -173,7 +173,7 @@ def _make_factory(
 
         # Update the signature for raw_to_derived to match what we are passed as this
         # will be checked in DerivedSignalFactory
-        DerivedTransform.raw_to_derived.__annotations__ = raw_to_derived.__annotations__
+        DerivedTransform.raw_to_derived.__annotations__ = get_type_hints(raw_to_derived)
 
         return DerivedSignalFactory(
             DerivedTransform, set_derived=set_derived, **(raw_devices or {})

ophyd_async/core/_table.py

@@ -93,18 +93,19 @@ class Table(BaseModel):
 
     def __add__(self, right: TableSubclass) -> TableSubclass:
         """Concatenate the arrays in field values."""
-        if type(right) is not type(self):
+        cls = type(right)
+        if type(self) is not cls:
             raise RuntimeError(
                 f"{right} is not a `Table`, or is not the same "
                 f"type of `Table` as {self}."
             )
 
-        return type(right)(
+        return cls(
             **{
                 field_name: _concat(
                     getattr(self, field_name), getattr(right, field_name)
                 )
-                for field_name in self.model_fields
+                for field_name in cls.model_fields
             }
         )
 

ophyd_async/testing/_assert.py

@@ -1,6 +1,7 @@
 import asyncio
+from collections.abc import Mapping
 from contextlib import AbstractContextManager
-from typing import Any
+from typing import Any, cast
 from unittest.mock import Mock, call
 
 import pytest
@@ -43,7 +44,7 @@ async def assert_value(signal: SignalR[SignalDatatypeT], value: Any) -> None:
 
 async def assert_reading(
     readable: AsyncReadable,
-    expected_reading: dict[str, dict[str, Any]],
+    expected_reading: Mapping[str, Mapping[str, Any]],
 ) -> None:
     """Assert that a readable Device has the given reading.
 
@@ -54,20 +55,25 @@ async def assert_reading(
     _assert_readings_approx_equal(expected_reading, actual_reading)
 
 
-def _assert_readings_approx_equal(expected, actual):
-    assert expected.keys() == actual.keys()
-    approx_expected_reading = {
-        k: dict(
-            v,
-            value=approx_value(v["value"]),
-            timestamp=pytest.approx(v["timestamp"], rel=0.1)
-            if "timestamp" in v
-            else actual[k]["timestamp"],
-            alarm_severity=v.get("alarm_severity", actual[k]["alarm_severity"]),
-        )
-        for k, v in expected.items()
+def _approx_reading(expected: Mapping[str, Any], actual: Reading) -> Reading:
+    ret = dict(
+        expected,
+        value=approx_value(expected["value"]),
+        timestamp=pytest.approx(expected["timestamp"], rel=0.1)
+        if "timestamp" in expected
+        else actual["timestamp"],
+    )
+    if "alarm_severity" in actual and "alarm_severity" not in expected:
+        ret["alarm_severity"] = actual["alarm_severity"]
+    return cast(Reading, ret)
+
+
+def _assert_readings_approx_equal(
+    expected: Mapping[str, Mapping[str, Any]], actual: Mapping[str, Reading]
+):
+    assert actual == {
+        k: _approx_reading(v, actual[k]) for k, v in expected.items() if k in actual
     }
-    assert actual == approx_expected_reading
 
 
 async def assert_configuration(

ophyd_async/testing/_single_derived.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 
 from ophyd_async.core import (

{ophyd_async-0.10.0a1.dist-info → ophyd_async-0.10.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.10.0a1
+Version: 0.10.0a2
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License

{ophyd_async-0.10.0a1.dist-info → ophyd_async-0.10.0a2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ophyd_async/__init__.py,sha256=dcAA3qsj1nNIMe5l-v2tlduZ_ypwBmyuHe45Lsq4k4w,206
 ophyd_async/__main__.py,sha256=n_U4O9bgm97OuboUB_9eK7eFiwy8BZSgXJ0OzbE0DqU,481
 ophyd_async/_docs_parser.py,sha256=gPYrigfSbYCF7QoSf2UvE-cpQu4snSssl7ZWN-kKDzI,352
-ophyd_async/_version.py,sha256=AdcjN4kVO4q5oA5MXB74BCO4OC6Vbb8sWbQTVnx9yt4,515
+ophyd_async/_version.py,sha256=vwU_BgU9ApXpWH564vijXNOtjK-ww1iSaNC4uWmoIT4,515
 ophyd_async/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ophyd_async/core/__init__.py,sha256=eFRVN5WJQKNcZbFtP8abDcra6d_mwFLA0A60AbXL2Vw,4484
-ophyd_async/core/_derived_signal.py,sha256=UKhqC6RYJ7iAqUvAXwECofm_J4_uyWvTXrikK2Svn0U,10404
+ophyd_async/core/_derived_signal.py,sha256=DS2-t_N8WOGjZjzt-0xRHaWIr3VzKFyV-WiRKRxf7ks,10404
 ophyd_async/core/_derived_signal_backend.py,sha256=5_J9AfRPueJZ-CEgpE7GSG9B1nHUFzanD0N2D1mrGrY,12216
 ophyd_async/core/_detector.py,sha256=J5Chu4sI9WgupB_3qh1c7ZOtlv9tSMJ3tXkHnsc9WIw,14517
 ophyd_async/core/_device.py,sha256=UjpKuGvwCYN0-I0qpdWzBI9uLSLieHryDsLf_9Qeu-Y,14593
@@ -21,7 +21,7 @@ ophyd_async/core/_signal.py,sha256=kqIvQXRP3n34-uhgTmbwm2fTIz_phJYyTT4Rm7P-gSs,2
 ophyd_async/core/_signal_backend.py,sha256=T8vJi-QuMfjB_uBB6iu_aApAY0j5pAFkDn5g2oSCbmI,6826
 ophyd_async/core/_soft_signal_backend.py,sha256=zrE7H2ojHY6oQBucLkFgukszrkdvbIZuavLjEUqc_xM,6227
 ophyd_async/core/_status.py,sha256=h4TtWFM7wFtpxxyAYYSITgcVzArYZdYBHbya6qIX5t0,6553
-ophyd_async/core/_table.py,sha256=46pR9CxNGA5E5-h-vpb2OT5tfaUXfZRSayKhDJHacs4,6888
+ophyd_async/core/_table.py,sha256=l5GzL3La68ZkXpcOOVntnYr8ofFV8kWGr1hzY1ek83w,6897
 ophyd_async/core/_utils.py,sha256=zEA3lLeOP0N17XGUH8irxvEW8hq0slkxY4gJV3f4YzE,11382
 ophyd_async/core/_yaml_settings.py,sha256=txy4_Igbsr8Yo132yv8jnCcsLpal8klM7DcPNow2KBs,2078
 ophyd_async/epics/__init__.py,sha256=ou4yEaH9VZHz70e8oM614-arLMQvUfQyXhRJsnEpWn8,60
@@ -136,14 +136,14 @@ ophyd_async/tango/testing/__init__.py,sha256=SYXPAS00ny3jlUMOJKpaewO4ljPjK1_z1sm
 ophyd_async/tango/testing/_one_of_everything.py,sha256=rPAgOoNGvaHMVhB79Gz70NI9tWk3QV5iKg5wAlAtqxU,6571
 ophyd_async/testing/__init__.py,sha256=f53HUj2hpIfrza9OlcOpHmq5wnziQNwixawAK4F1xgc,1698
 ophyd_async/testing/__pytest_assert_rewrite.py,sha256=_SU2UfChPgEf7CFY7aYH2B7MLp-07_qYnVLyu6QtDL8,129
-ophyd_async/testing/_assert.py,sha256=sBa2KnNzP01dWDHPKbujIiQk1bw1nTjUyRJKnVPH8Q0,7439
+ophyd_async/testing/_assert.py,sha256=FrMgMfo-ABq_cMT-hJmoaTxhAY4TwAvGe4ae1SF1rME,7657
 ophyd_async/testing/_mock_signal_utils.py,sha256=d-n_923ii59-ae9TbqVuIK9MAJpDmu0k47fzgJLj8t8,5195
 ophyd_async/testing/_one_of_everything.py,sha256=Di0hPoKwrDOSsx50-2UdSHM2EbIKrPG9s0Vp11nE9V8,4773
-ophyd_async/testing/_single_derived.py,sha256=icuTFUSaNf_9dZQ37Nt4VHUUERlFdqObhq8S4URdBCo,2694
+ophyd_async/testing/_single_derived.py,sha256=5-HOTzgePcZ354NK_ssVpyIbJoJmKyjVQCxSwQXUC-4,2730
 ophyd_async/testing/_utils.py,sha256=zClRo5ve8RGia7wQnby41W-Zprj-slOA5da1LfYnuhw,45
 ophyd_async/testing/_wait_for_pending.py,sha256=YZAR48n-CW0GsPey3zFRzMJ4byDAr3HvMIoawjmTrHw,732
-ophyd_async-0.10.0a1.dist-info/licenses/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
-ophyd_async-0.10.0a1.dist-info/METADATA,sha256=8nZ_nv3FefQVDkrlIo6ilDFx8ijbY9tAD6PDvoLAtjE,7075
-ophyd_async-0.10.0a1.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-ophyd_async-0.10.0a1.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
-ophyd_async-0.10.0a1.dist-info/RECORD,,
+ophyd_async-0.10.0a2.dist-info/licenses/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
+ophyd_async-0.10.0a2.dist-info/METADATA,sha256=HhNyZ27Piz8QHIz_DzFZnRD_ZJ5oCRRxfEGY5YF9WlU,7075
+ophyd_async-0.10.0a2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ophyd_async-0.10.0a2.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
+ophyd_async-0.10.0a2.dist-info/RECORD,,

{ophyd_async-0.10.0a1.dist-info → ophyd_async-0.10.0a2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any