From a80c572280cc9ccbdf21af69e34a463e61594db5 Mon Sep 17 00:00:00 2001 From: Fernando Date: Fri, 10 Feb 2023 15:54:21 -0300 Subject: [PATCH 1/2] MNT: remove pyvisa and pyvisa-py, according to lnls-sirius/dev-packages#908. --- dockerfile-templates/Dockerfile.deps | 2 -- pkg-versions.txt | 1 - 2 files changed, 3 deletions(-) diff --git a/dockerfile-templates/Dockerfile.deps b/dockerfile-templates/Dockerfile.deps index 0fe5703..a8a5fc6 100644 --- a/dockerfile-templates/Dockerfile.deps +++ b/dockerfile-templates/Dockerfile.deps @@ -28,8 +28,6 @@ RUN pip-sirius install \ aiohttp \ bottleneck \ python-dateutil \ - pyvisa:pkg_version_pyvisa \ - pyvisa_py \ urllib3 \ scipy \ pydantic \ diff --git a/pkg-versions.txt b/pkg-versions.txt index 97650f0..576afbd 100644 --- a/pkg-versions.txt +++ b/pkg-versions.txt @@ -1,7 +1,6 @@ pkg_version_pip ==21.3.1 pkg_version_pyepics ==3.4.0 pkg_version_pcaspy ==0.7.3 -pkg_version_pyvisa ==1.11.3 pkg_version_gpy ==1.10.0 pkg_version_python2_pip ==9.0.1 From 913847e0a9db1ca357cd725c9a7039cbaf8625da Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Fri, 10 Feb 2023 16:30:49 -0300 Subject: [PATCH 2/2] Update IMG_DEPS_TAG and DEPLOY_TAG --- tags.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tags.mk b/tags.mk index a1f1d23..597e2b3 100644 --- a/tags.mk +++ b/tags.mk @@ -10,11 +10,11 @@ EPICS_BASE_TAG ?= base-3.15.6 # tags used for creating docker images IMG_DEBIAN_TAG ?= bullseye-20211011 -DEPLOY_TAG ?= 2023-02-07 +DEPLOY_TAG ?= 2023-02-10 # image tags used for starting docker services IMG_IOCS_LI_PS_TAG ?= 2022-12-03 IMG_PYTHON_TAG ?= 2022-12-03 # also used as base image for fac-epics IMG_EPICS_TAG ?= 2022-12-03 -IMG_DEPS_TAG ?= 2023-02-07 +IMG_DEPS_TAG ?= 2023-02-10 IMG_IOCS_TAG ?= $(DEPLOY_TAG)