Merge branch 'master' into bluesky_1682_add_opentelemetry_tracing

MAINTAINERS.md

@@ -0,0 +1,9 @@
+As decided in the [governance](https://github.com/bluesky/governance#summary) this repo has the following maintainers:
+
+* Max Rakitin (@mrakitin), NSLS-II
+* Thomas Caswell (@tacaswell), NSLS-II
+* Dominic Oram (@DominicOram), DLS
+* Blaise Thompson (@untzag), UW Madison
+* Zach Lentz (@ZLLentz), LCLS
+* Robert Tang-Kong (@tangkong), LCLS
+* Pete Jemian (@prjemian), APS

docs/conf.py

@@ -103,11 +103,11 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    "python": ("https://docs.python.org/3", None),
-    "bluesky": ("https://blueskyproject.io/bluesky/main", None),
+    "python": ("https://docs.python.org/3/", None),
+    "bluesky": ("https://blueskyproject.io/bluesky/main/", None),
     "numpy": ("https://numpy.org/devdocs/", None),
     "databroker": ("https://blueskyproject.io/databroker/", None),
-    "event-model": ("https://blueskyproject.io/event-model/main", None),
+    "event-model": ("https://blueskyproject.io/event-model/main/", None),
 }
 
 # If False and a module has the __all__ attribute set, autosummary documents

setup.cfg

@@ -29,6 +29,7 @@ install_requires =
 ca =
     aioca>=1.6
 pva =
+    numpy<2.0 # See https://github.com/mdavidsaver/p4p/issues/145
     p4p; python_version < '3.12'
 # For development tests/docs
 dev =