From dc091b5480890fff592fe0e94646eab6565071cb Mon Sep 17 00:00:00 2001
From: Fabio Roberto Vitello <fabio.vitello@inaf.it>
Date: Sun, 24 May 2020 11:36:27 +0200
Subject: [PATCH] Updated numpy to 1.16.6
The pipeline was crashing due a numpy error that is fixed in version >1.16.
meqtrees_cattery was not happy with numpy > 1.16 due his specification:
pkg_resources.ContextualVersionConflict: (numpy 1.16.6), Requirement.parse('numpy<=1.16'), set(['meqtrees-cattery']))
Edited Dockerfile to change the version on the METADATA
---
.gitignore | 3 +++
ddf2/Dockerfile | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c0ff1e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+ddf2/DDFacet/
+ddf2/killMS/
diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile
index e2ad608..b5e3989 100644
--- a/ddf2/Dockerfile
+++ b/ddf2/Dockerfile
@@ -32,16 +32,18 @@ COPY DDFacet /opt/DDFacet
RUN cp /opt/ddf-pipeline/misc/setup.cfg /opt/DDFacet/ # Fix compile options
RUN python -m pip install -U pip setuptools wheel
RUN pip install -U pip setuptools wheel
-RUN python -m pip install numpy==1.16 bdsf==1.8.15 emcee
+RUN python -m pip install numpy==1.16.6 bdsf==1.8.15 emcee
RUN python -m pip install pybind11 future pyregion sshtunnel pymysql psutil
RUN python -m pip install -U "/opt/DDFacet/[dft-support,moresane-support,testing-requirements,fits-beam-support]"
RUN cd /opt/DDFacet && rm -rf /opt/DDFacet/Dcbuild && python setup.py build
-RUN python -m pip install bdsf==1.8.15
+RUN python -m pip install bdsf==1.8.15 numpy==1.16.6
RUN sed -e "s|INSTALLDIR|/opt|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh
+RUN sed 's/numpy (<=1.16)/numpy (<=1.16.6)/g' /usr/local/lib/python2.7/dist-packages/meqtrees_cattery-1.7.0.dist-info/METADATA > /usr/local/lib/python2.7/dist-packages/meqtrees_cattery-1.7.0.dist-info/METADATA
+
RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git
#USER lofar
--
GitLab