Skip to content
Snippets Groups Projects

Updated DDF2 Dependencies

Merged Updated DDF2 Dependencies
feature/ddf2 into master
Merged Fabio Roberto Vitello requested to merge feature/ddf2 into master
Viewing commit dc091b54
Prev Next
Show latest version
2 files
+ 7
− 2
Compare changes
  • Side-by-side
  • Inline
Files
2
  • dc091b54
    Fabio Roberto Vitello
    Updated numpy to 1.16.6 · dc091b54
    Fabio Roberto Vitello authored 
    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
ddf2/Dockerfile
+ 4
− 2
@@ -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