Merge pull request #1200 from dperl-dls/1199_override_container_depre…

…cation

Override docker version deprecation

docs/conf.py

@@ -104,7 +104,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
-    "bluesky": ("https://blueskyproject.io/bluesky/", 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),

scripts/docker.conf

@@ -0,0 +1,2 @@
+[Service]
+Environment="DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1"

scripts/epics_docker.sh

@@ -3,6 +3,14 @@
 SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $SCRIPTS_DIR/epics_exports.sh
 
+# Override the deprecation warning of V1 images
+# Remove when images are updated
+sudo mkdir -p /etc/systemd/system/docker.service.d
+file="/etc/systemd/system/docker.service.d/extra_env.conf"
+sudo cp $SCRIPTS_DIR/docker.conf $file
+sudo systemctl daemon-reload
+sudo systemctl restart docker
+
 MOTOR_DOCKERIMAGE="nsls2/epics-docker:latest"
 PE_DOCKERIMAGE="nsls2/pyepics-docker:latest"
 AD_DOCKERIMAGE="prjemian/synapps-6.1-ad-3.7:latest"

setup.cfg

@@ -28,6 +28,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 =