Merge branch 'main' into 472_set_up_centring_correctly

DiamondLightSource · Sep 25, 2024 · 312f376 · 312f376
2 parents 40eed73 + e6dcc1c
commit 312f376
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -45,7 +45,7 @@ dependencies = [
     "ophyd == 1.9.0",
     "ophyd-async >= 0.3a5",
     "bluesky >= 1.13.0a4",
-    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
+    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@db42ad951155ba2cfd7574d3b5452c9bf975bfcf",
 ]
 
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -462,7 +462,7 @@ def undulator_dcm(RE, dcm):
 @pytest.fixture
 def webcam(RE) -> Generator[Webcam, Any, Any]:
     webcam = i03.webcam(fake_with_ophyd_sim=True)
-    with patch.object(webcam, "_write_image"):
+    with patch.object(webcam, "_get_and_write_image"):
         yield webcam