Updates to work with ophyd-registry v2.0.0

environment.yml

@@ -47,7 +47,7 @@ dependencies:
     - autoapi
     - pytest-mongodb
     - StrEnum
-    - ophyd-registry >= 1.3.3
+    - ophyd-registry >= 2.0.0rc1
     - guarneri >= 0.2.0
     - xraydb >=4.5.0
     - pytest-timeout  # Get rid of this if tests are not hanging

pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 keywords = ["synchrotron", "xray", "bluesky"]
 dependencies = ["aioca", "aiokafka", "bluesky", "ophyd", "ophyd-async>=0.9.0a1", "apsbss", "xraydb",
 	        "mergedeep", "xrayutilities", "bluesky-queueserver-api", "tomlkit",
-		"apstools", "ophyd-registry", "caproto", "pcdsdevices",
+		"apstools", "ophyd-registry>=2.0.0rc1", "caproto", "pcdsdevices",
 		"bluesky-adaptive", "tiled[client]", "guarneri>=0.2.0"]
 
 [project.optional-dependencies]

src/haven/ipython_startup.ipy

@@ -60,7 +60,7 @@ print(f"Connected to {num_devices} devices in {time.monotonic() - t0:.2f} second
 # Save references to all the devices in the global namespace
 devices = haven.beamline.devices
 ion_chambers = devices.findall("ion_chambers", allow_none=True)
-for cpt in devices._objects_by_name.values():
+for cpt in devices.all_devices:
     # Replace spaces and other illegal characters in variable name
     name = haven.sanitize_name(cpt.name)
     # Add the device as a variable in module's globals

src/haven/motor_position.py

@@ -115,7 +115,7 @@ def save_motor_position(*motors, name: str, md: Mapping = {}):
 
     """
     # Resolve device names or labels
-    motors = beamline.devices.findall(motors)
+    motors = [beamline.devices[motor] for motor in motors]
     # Create the new run object
     _md = {
         "position_name": name,

src/haven/tests/test_instrument_registry.py

@@ -1,5 +1,5 @@
 import pytest
-from ophyd import Device, EpicsMotor, sim
+from ophyd import Device, sim
 from ophydregistry import Registry
 
 from haven.exceptions import ComponentNotFound, MultipleComponentsFound
@@ -255,14 +255,6 @@ def test_find_by_list_of_names(reg):
     assert cptC not in result
 
 
-def test_user_readback(reg):
-    """Edge case where EpicsMotor.user_readback is named the same as the motor itself."""
-    device = EpicsMotor("", name="epics_motor")
-    reg.register(device)
-    # See if requesting the device.user_readback returns the proper signal
-    reg["epics_motor_user_readback"]
-
-
 # -----------------------------------------------------------------------------
 # :author:    Mark Wolfman
 # :email:     [email protected]

src/queueserver/queueserver_startup.py

@@ -40,7 +40,7 @@
     call_in_bluesky_event_loop(beamline.connect())
 except NotConnected as exc:
     log.exception(exc)
-for cpt in beamline.devices._objects_by_name.values():
+for cpt in beamline.devices.all_devices:
     # Replace spaces and other illegal characters in variable name
     # name = re.sub('\W|^(?=\d)','_', cpt.name)
     name = sanitize_name(cpt.name)