Remove pin on dodal, resolve Union removal

DiamondLightSource · Apr 18, 2024 · 3dd6fa9 · 3dd6fa9
1 parent f43bd12
commit 3dd6fa9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
     "uvicorn",
     "requests",
     "dls-bluesky-core",  #requires ophyd-async
-    "dls-dodal<1.21",
+    "dls-dodal",
 ]
 dynamic = ["version"]
 license.file = "LICENSE"

diff --git a/src/blueapi/config.py b/src/blueapi/config.py
@@ -64,10 +64,9 @@ class DataWritingConfig(BlueapiBaseModel):
     """
 
     beamline: str = "example"
-    root: Path | None = (
-        None  # When mounting with a static root, e.g. /2024/cm12345-1/
-    )
-    visit_service_url: Optional[str] = None  # e.g. "http://localhost:8088/api"
+    root: Path | None = None  # When mounting with a static root, e.g. /2024/cm12345-1/
+    visit_service_url: str | None = None  # e.g. "http://localhost:8088/api"
+
 
 class WorkerEventConfig(BlueapiBaseModel):
     """

diff --git a/src/blueapi/data_management/visit_directory_provider.py b/src/blueapi/data_management/visit_directory_provider.py
@@ -85,7 +85,7 @@ class VisitDirectoryProvider(DirectoryProvider):
     def __init__(
         self,
         beamline: str,
-        root: Optional[Path],
+        root: Path | None,
         client: VisitServiceClientBase,
     ):
         self._client = client