dls-dodal 1.31.0__tar.gz → 1.31.1__tar.gz

{dls_dodal-1.31.0 → dls_dodal-1.31.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.31.0
+Version: 1.31.1
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.31.0 → dls_dodal-1.31.1}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.31.0
+Version: 1.31.1
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.31.0 → dls_dodal-1.31.1}/src/dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.31.0'
-__version_tuple__ = version_tuple = (1, 31, 0)
+__version__ = version = '1.31.1'
+__version_tuple__ = version_tuple = (1, 31, 1)

{dls_dodal-1.31.0 → dls_dodal-1.31.1}/src/dodal/devices/detector/detector.py

@@ -79,7 +79,7 @@ class DetectorParams(BaseModel):
     def _parse_directory(cls, directory: str | Path) -> str:
         path = Path(directory)
         assert path.is_dir()
-        return str(path)
+        return f"{path}/"
 
     def get_beam_position_mm(self, detector_distance: float) -> tuple[float, float]:
         x_beam_mm = self.beam_xy_converter.get_beam_xy_from_det_dist(

{dls_dodal-1.31.0 → dls_dodal-1.31.1}/src/dodal/devices/util/lookup_tables.py

@@ -27,7 +27,7 @@ async def energy_distance_table(lookup_table_path: str) -> np.ndarray:
 
     # Slight cheat to make the file IO async, numpy doesn't do any real IO now, just
     # decodes the text
-    async with aiofiles.open(lookup_table_path, "r") as stream:
+    async with aiofiles.open(lookup_table_path) as stream:
         raw_table = await stream.read()
     return loadtxt(StringIO(raw_table), comments=["#", "Units"])
 

{dls_dodal-1.31.0 → dls_dodal-1.31.1}/tests/devices/unit_tests/detector/test_detector.py

@@ -28,7 +28,7 @@ def create_det_params_with_dir_and_prefix(directory: str | Path, prefix="test"):
 def test_if_string_provided_check_is_dir(tmp_path: Path):
     assert not (_dir := str(tmp_path)).endswith("/")
     params = create_det_params_with_dir_and_prefix(_dir)
-    assert params.directory == str(tmp_path)
+    assert params.directory == f"{tmp_path}/"
     file_path = tmp_path / "foo.h5"
     file_path.touch()
     with pytest.raises(ValidationError):
@@ -37,7 +37,7 @@ def test_if_string_provided_check_is_dir(tmp_path: Path):
 
 def test_if_path_provided_check_is_dir(tmp_path: Path):
     params = create_det_params_with_dir_and_prefix(tmp_path)
-    assert params.directory == str(tmp_path)
+    assert params.directory == f"{tmp_path}/"
     file_path = tmp_path / "foo.h5"
     file_path.touch()
     with pytest.raises(ValidationError):