From e7a9c9a14c3018d5ed2664ce456d6cf3247123a1 Mon Sep 17 00:00:00 2001 From: David Perl Date: Wed, 3 Jul 2024 16:37:28 +0100 Subject: [PATCH 1/2] override docker version deprecation --- scripts/docker.conf | 2 ++ scripts/epics_docker.sh | 8 ++++++++ setup.cfg | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 scripts/docker.conf diff --git a/scripts/docker.conf b/scripts/docker.conf new file mode 100644 index 000000000..ae284beff --- /dev/null +++ b/scripts/docker.conf @@ -0,0 +1,2 @@ +[Service] +Environment="DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1" \ No newline at end of file diff --git a/scripts/epics_docker.sh b/scripts/epics_docker.sh index aa96c12b8..405c19fb7 100755 --- a/scripts/epics_docker.sh +++ b/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" diff --git a/setup.cfg b/setup.cfg index 5c99ccd28..02f59d1d6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ setup_requires = # Specify any package dependencies below. install_requires = networkx>=2.0 - numpy + numpy<2.0 # See https://github.com/mdavidsaver/p4p/issues/145 packaging pint From 5dc4a8cdf9dcb3955b15955bca4f952297b5896e Mon Sep 17 00:00:00 2001 From: David Perl Date: Thu, 4 Jul 2024 12:45:32 +0100 Subject: [PATCH 2/2] pin numpy only for pva, update sphinx link --- docs/conf.py | 2 +- setup.cfg | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 5df84c2d4..9ffcb5f39 100644 --- a/docs/conf.py +++ b/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), diff --git a/setup.cfg b/setup.cfg index 02f59d1d6..3b4bf98b1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ setup_requires = # Specify any package dependencies below. install_requires = networkx>=2.0 - numpy<2.0 # See https://github.com/mdavidsaver/p4p/issues/145 + numpy packaging pint @@ -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 =