From 38e3366385f19c1a16e69e2c8275442b67aaed9b Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Mon, 16 Jan 2023 10:19:37 -0300 Subject: [PATCH 1/2] Fix pyvisa installation --- dockerfile-templates/Dockerfile.deps | 2 +- dockerfile-templates/Dockerfile.epics | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dockerfile-templates/Dockerfile.deps b/dockerfile-templates/Dockerfile.deps index 2223810..3b4e00a 100644 --- a/dockerfile-templates/Dockerfile.deps +++ b/dockerfile-templates/Dockerfile.deps @@ -28,7 +28,7 @@ RUN pip-sirius install \ aiohttp \ bottleneck \ python-dateutil \ - pyvisa \ + pyvisa:pkg_version_pyvisa\ pyvisa_py \ urllib3 \ scipy \ diff --git a/dockerfile-templates/Dockerfile.epics b/dockerfile-templates/Dockerfile.epics index 4b39a70..c6b5a05 100644 --- a/dockerfile-templates/Dockerfile.epics +++ b/dockerfile-templates/Dockerfile.epics @@ -27,5 +27,4 @@ ENV PATH="${PATH}:/opt/repos/${EPICS_BASE_TAG}/bin/linux-x86_64" \ RUN pip-sirius install \ pyepics:pkg_version_pyepics \ - pcaspy:pkg_version_pcaspy \ - pyvisa:pkg_version_pyvisa + pcaspy:pkg_version_pcaspy From 4ee34d58625f46febdcb5fbcff8bd5d39830bbc3 Mon Sep 17 00:00:00 2001 From: ximenes Date: Mon, 16 Jan 2023 10:23:16 -0300 Subject: [PATCH 2/2] Merge --- dockerfile-templates/Dockerfile.deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfile-templates/Dockerfile.deps b/dockerfile-templates/Dockerfile.deps index 3b4e00a..8498e73 100644 --- a/dockerfile-templates/Dockerfile.deps +++ b/dockerfile-templates/Dockerfile.deps @@ -28,7 +28,7 @@ RUN pip-sirius install \ aiohttp \ bottleneck \ python-dateutil \ - pyvisa:pkg_version_pyvisa\ + pyvisa:pkg_version_pyvisa \ pyvisa_py \ urllib3 \ scipy \