ophyd-async 0.9.0__tar.gz → 0.9.0a2__tar.gz

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ophyd-async
-Version: 0.9.0
+Version: 0.9.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.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.9.0'
+__version__ = version = '0.9.0a2'
 __version_tuple__ = version_tuple = (0, 9, 0)

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async/core/_utils.py

@@ -34,20 +34,6 @@ class StrictEnum(str, Enum, metaclass=StrictEnumMeta):
 
 class SubsetEnumMeta(StrictEnumMeta):
     def __call__(self, value, *args, **kwargs):  # type: ignore
-        """
-        Returns given value if it is a string and not a member of the enum.
-        If the value is not a string or is an enum member, default enum behavior
-        is applied. Type checking will complain if provided arbitrary string.
-
-        Returns:
-            Union[str, SubsetEnum]: If the value is a string and not a member of the
-            enum, the string is returned as is. Otherwise, the corresponding enum
-            member is returned.
-
-        Raises:
-            ValueError: If the value is not a string and cannot be converted to an enum
-            member.
-        """
         if isinstance(value, str) and not isinstance(value, self):
             return value
         return super().__call__(value, *args, **kwargs)

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async/epics/adcore/_hdf_writer.py

@@ -46,7 +46,7 @@ class ADHDFWriter(ADWriter[NDFileHDFIO]):
         )
         self._datasets: list[HDFDataset] = []
         self._file: HDFFile | None = None
-        self._filename_template = "%s%s"
+        self._include_file_number = False
 
     async def open(self, multiplier: int = 1) -> dict[str, DataKey]:
         self._file = None
@@ -63,6 +63,11 @@ class ADHDFWriter(ADWriter[NDFileHDFIO]):
             self.fileio.xml_file_name.set(""),
         )
 
+        # By default, don't add file number to filename
+        self._filename_template = "%s%s"
+        if self._include_file_number:
+            self._filename_template += "_%6.6d"
+
         # Set common AD file plugin params, begin capturing
         await self.begin_capture()
 

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async/epics/core/_aioca.py

@@ -293,27 +293,13 @@ class CaSignalBackend(EpicsSignalBackend[SignalDatatypeT]):
             write_value = self.initial_values[self.write_pv]
         else:
             write_value = self.converter.write_value(value)
-        try:
-            await caput(
-                self.write_pv,
-                write_value,
-                datatype=self.converter.write_dbr,
-                wait=wait,
-                timeout=None,
-            )
-        except CANothing as exc:
-            # If we ran into a write error, check to see if there is a list
-            # of valid choices, and if the value we tried to write is in that list.
-            valid_choices = self.converter.metadata.get("choices")
-            if valid_choices:
-                if value not in valid_choices:
-                    msg = (
-                        f"{value} is not a valid choice for {self.write_pv}, "
-                        f"valid choices: {self.converter.metadata.get('choices')}"
-                    )
-                    raise ValueError(msg) from exc
-                raise
-            raise
+        await caput(
+            self.write_pv,
+            write_value,
+            datatype=self.converter.write_dbr,
+            wait=wait,
+            timeout=None,
+        )
 
     async def get_datakey(self, source: str) -> DataKey:
         value = await self._caget(self.read_pv, FORMAT_CTRL)

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async/epics/testing/_example_ioc.py

@@ -44,7 +44,6 @@ class EpicsTestCaDevice(EpicsDevice):
     enum: A[SignalRW[EpicsTestEnum], PvSuffix("enum")]
     enum2: A[SignalRW[EpicsTestEnum], PvSuffix("enum2")]
     subset_enum: A[SignalRW[EpicsTestSubsetEnum], PvSuffix("subset_enum")]
-    enum_str_fallback: A[SignalRW[str], PvSuffix("enum_str_fallback")]
     bool_unnamed: A[SignalRW[bool], PvSuffix("bool_unnamed")]
     partialint: A[SignalRW[int], PvSuffix("partialint")]
     lessint: A[SignalRW[int], PvSuffix("lessint")]

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async/epics/testing/test_records.db

@@ -104,14 +104,6 @@ record(mbbo, "$(device)subset_enum") {
   field(PINI, "YES")
 }
 
-record(mbbo, "$(device)enum_str_fallback") {
-  field(ZRST, "Aaa")
-  field(ONST, "Bbb")
-  field(TWST, "Ccc")
-  field(VAL, "1")
-  field(PINI, "YES")
-}
-
 record(waveform, "$(device)uint8a") {
   field(NELM, "3")
   field(FTVL, "UCHAR")

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/src/ophyd_async.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ophyd-async
-Version: 0.9.0
+Version: 0.9.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.9.0 → ophyd_async-0.9.0a2}/tests/epics/signal/test_signals.py

@@ -406,19 +406,6 @@ async def test_writing_to_ndarray_raises_typeerror(ioc_devices: EpicsTestIocAndD
         await signal.set(np.zeros((6,), dtype=np.int64))
 
 
-async def test_invalid_enum_choice_raises_valueerror(
-    ioc_devices: EpicsTestIocAndDevices,
-):
-    signal = ioc_devices.ca_device.enum_str_fallback
-    await signal.connect()
-    with pytest.raises(ValueError) as exc:
-        await signal.set("Ddd")
-    assert "Ddd is not a valid choice for" in str(exc.value)
-    assert "ca:enum_str_fallback, valid choices: ['Aaa', 'Bbb', 'Ccc']" in str(
-        exc.value
-    )
-
-
 @pytest.mark.parametrize("protocol", get_args(Protocol))
 async def test_error_raised_on_disconnected_PV(
     ioc_devices: EpicsTestIocAndDevices, protocol: Protocol

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/tests/epics/signal/test_yaml_save_ca.yaml

@@ -1,7 +1,6 @@
 bool_unnamed: true
 enum: Bbb
 enum2: Bbb
-enum_str_fallback: Bbb
 float32a: [1.9999999949504854e-06, -123.12300109863281]
 float64a: [0.1, -12345678.123]
 float_prec_0: 3

{ophyd_async-0.9.0 → ophyd_async-0.9.0a2}/tests/epics/signal/test_yaml_save_pva.yaml

@@ -1,7 +1,6 @@
 bool_unnamed: true
 enum: Bbb
 enum2: Bbb
-enum_str_fallback: Bbb
 float32a: [1.9999999949504854e-06, -123.12300109863281]
 float64a: [0.1, -12345678.123]
 float_prec_0: 3.0