Skip to content

Commit

Permalink
(#698) Pin zocalo to < 1.0.0 to prevent pydantic dependency mismatch (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
rtuck99 authored Jul 23, 2024
1 parent ad3c5a8 commit 061e59b
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 061e59b

Please sign in to comment.