ophyd-async 0.3.3__tar.gz → 0.3.4__tar.gz

{ophyd_async-0.3.3 → ophyd_async-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ophyd-async
-Version: 0.3.3
+Version: 0.3.4
 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.3.3 → ophyd_async-0.3.4}/src/ophyd_async/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.3'
-__version_tuple__ = version_tuple = (0, 3, 3)
+__version__ = version = '0.3.4'
+__version_tuple__ = version_tuple = (0, 3, 4)

{ophyd_async-0.3.3 → ophyd_async-0.3.4}/src/ophyd_async/core/soft_signal_backend.py

@@ -93,10 +93,7 @@ class SoftEnumConverter(SoftConverter):
             self.choices = datatype.choices
 
     def write_value(self, value: Union[Enum, str]) -> str:
-        if isinstance(value, Enum):
-            return value.value
-        else:  # Runtime enum
-            return value
+        return value
 
     def get_datakey(self, source: str, value, **metadata) -> DataKey:
         return {

{ophyd_async-0.3.3 → ophyd_async-0.3.4}/src/ophyd_async/epics/areadetector/drivers/aravis_driver.py

@@ -1,6 +1,6 @@
 from enum import Enum
-from typing import Literal
 
+from ophyd_async.core import SubsetEnum
 from ophyd_async.epics.areadetector.drivers import ADBase
 from ophyd_async.epics.signal.signal import epics_signal_rw_rbv
 
@@ -19,7 +19,7 @@ class AravisTriggerMode(str, Enum):
     To prevent requiring one Enum class per possible configuration, we set as this Enum
     but read from the underlying signal as a str.
     """
-AravisTriggerSource = Literal["Freerun", "Line1", "Line2", "Line3", "Line4"]
+AravisTriggerSource = SubsetEnum["Freerun", "Line1"]
 
 
 class AravisDriver(ADBase):
@@ -34,5 +34,7 @@ class AravisDriver(ADBase):
         self.trigger_mode = epics_signal_rw_rbv(
             AravisTriggerMode, prefix + "TriggerMode"
         )
-        self.trigger_source = epics_signal_rw_rbv(str, prefix + "TriggerSource")
+        self.trigger_source = epics_signal_rw_rbv(
+            AravisTriggerSource, prefix + "TriggerSource"
+        )
         super().__init__(prefix, name=name)

{ophyd_async-0.3.3 → ophyd_async-0.3.4}/src/ophyd_async.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ophyd-async
-Version: 0.3.3
+Version: 0.3.4
 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.3.3 → ophyd_async-0.3.4}/tests/core/test_soft_signal_backend.py

@@ -115,6 +115,14 @@ async def test_soft_signal_backend_get_put_monitor(
         q.close()
 
 
+async def test_soft_signal_backend_enum_value_equivalence():
+    soft_signal = SoftSignalBackend(MyEnum)
+    await soft_signal.connect()
+    assert (await soft_signal.get_value()) is MyEnum.a
+    await soft_signal.put(MyEnum.b)
+    assert (await soft_signal.get_value()) is MyEnum.b
+
+
 async def test_soft_signal_backend_with_numpy_typing():
     soft_backend = SoftSignalBackend(npt.NDArray[np.float64])
     await soft_backend.connect()