Merge branch 'main' into 44_zoomcalibrator

pyproject.toml

@@ -40,12 +40,12 @@ dependencies = [
  # These dependencies may be issued as pre-release versions and should have a pin constraint
  # as by default pip-install will not upgrade to a pre-release.
  # 
- "blueapi == 0.4.5a1",
+ "blueapi >= 0.5.0",
  "daq-config-server >= 0.1.1",
  "ophyd == 1.9.0",
  "ophyd-async >= 0.3a5",
  "bluesky >= 1.13.0a4",
- "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@9e0e09ac0166899d49128e6c6a01e7c14e443f1f",
+ "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@5e8b6fc2933a2b2b2e788d432c8408317ac4a5cc",
 ]
 
 
@@ -58,7 +58,8 @@ requires-python = ">=3.11"
 dev = [
  "black",
  "build",
- "copier",
+ # Commented out due to dependency version conflict with pydantic 1.x
+ # "copier",
  "diff-cover",
  "GitPython",
  "ipython",
@@ -120,10 +121,7 @@ addopts = """
 # https://iscinumpy.gitlab.io/post/bound-version-constraints/#watch-for-warnings
 filterwarnings = [
  "error",
- # Ignore deprecation warning from zocalo (https://github.com/DiamondLightSource/python-zocalo/issues/256)
- "ignore::DeprecationWarning:zocalo",
- "ignore::DeprecationWarning:pkg_resources",
- # Ignore incorrect errors from bluesky (remove when https://github.com/bluesky/bluesky/issues/1797 is released)
+ # Ignore incorrect errors from bluesky (remove when https://github.com/bluesky/bluesky/issues/1797 is released)
  "ignore:((.|\n)*)was never iterated.*:RuntimeWarning",
  # Ignore deprecation warning from sqlalchemy
  "ignore::sqlalchemy.exc.MovedIn20Warning",
@@ -135,6 +133,8 @@ filterwarnings = [
  "ignore:(.*)unclosed file(.*)name='(.*)dodal.log'(.*):ResourceWarning",
  "ignore:(.*)unclosed <socket(.*):ResourceWarning",
  "ignore:(.*)unclosed event loop(.*):ResourceWarning",
+ # Ignore pydantic 2 issues from blueapi, see https://github.com/DiamondLightSource/blueapi/issues/622
+ "ignore::DeprecationWarning:blueapi",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests/unit_tests"