From 061e59beeda706477b4deba0fbac3855c5354d55 Mon Sep 17 00:00:00 2001
From: rtuck99 <robert.tuck@diamond.ac.uk>
Date: Tue, 23 Jul 2024 15:40:39 +0100
Subject: [PATCH] (#698) Pin zocalo to < 1.0.0 to prevent pydantic dependency
 mismatch (#699)

---
 pyproject.toml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index fed5b2eed8..daa82b3b94 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ dependencies = [
     "pyepics",
     "dataclasses-json",
     "pillow",
-    "zocalo>=0.32.0",
+    "zocalo>=0.32.0,<1.0.0",  # TODO remove pin against <1.0.0, see #679
     "requests",
     "graypy",
     "pydantic",
@@ -107,11 +107,7 @@ filterwarnings = [
     # Ignore deprecation warning from ophyd_async
     "ignore:dep_util is Deprecated. Use functions from setuptools instead.:DeprecationWarning",
     # Ignore deprecation warning from zocalo
-    "ignore:.*pkg_resources.*:DeprecationWarning",
-    # Ignore Pydantic v2 warnings about deprecated @root-validators and config
-    "ignore::pydantic.warnings.PydanticDeprecatedSince20",
-    "ignore:Valid config keys have changed in V2.*:UserWarning"
-    
+    "ignore:.*pkg_resources.*:DeprecationWarning"
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests"