From 1a2158196e1aabbe13998d5bb740f7eac4146ad9 Mon Sep 17 00:00:00 2001 From: sfomel Date: Thu, 12 Dec 2024 09:15:51 -0600 Subject: [PATCH] python3 --- admin/docker/4.0-dev-tex/Dockerfile | 73 +++++++++++++++++++++++++++++ api/python/SConstruct | 2 +- configure | 2 +- 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 admin/docker/4.0-dev-tex/Dockerfile diff --git a/admin/docker/4.0-dev-tex/Dockerfile b/admin/docker/4.0-dev-tex/Dockerfile new file mode 100644 index 0000000000..80fd55e798 --- /dev/null +++ b/admin/docker/4.0-dev-tex/Dockerfile @@ -0,0 +1,73 @@ +# pull ubuntu 18.04 from Docker repo +FROM ubuntu:18.04 + +MAINTAINER "Zhicheng Geng " + +# install packages for madagascar +RUN apt-get update && apt-get install -y \ + git \ + python2.7 \ + python-pip \ + openssh-client \ + tar \ + gzip \ + wget \ + vim \ + emacs \ + make \ + man \ + && apt-get install -y \ + libblas-dev \ + liblapack-dev \ + swig \ + libxaw7-dev \ + freeglut3-dev \ + libnetpbm10-dev \ + libtiff5-dev \ + libgd-dev \ + libplplot-dev \ + libavcodec-dev \ + libcairo2-dev \ + libjpeg-dev \ + libopenmpi-dev \ + libfftw3-dev \ + libsuitesparse-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +# install python packages +RUN pip install numpy scipy + +# get code from github +RUN git clone https://github.com/ahay/src.git $HOME/RSFSRC + +# set environment variable for installing madagascar +ENV RSFROOT /root/RSFROOT + +# install madagascar +RUN cd ~/RSFSRC \ + && ./configure \ + && make install + +# install latex +RUN apt-get update && apt-get install -y \ + texlive-latex-recommended \ + texlive-latex-extra \ + texlive-fonts-recommended \ + texlive-bibtex-extra \ + texlive-lang-english \ + texlive-generic-extra \ + biber \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* + +# install segtex +RUN git clone https://github.com/SEGTeX/texmf $HOME/texmf \ + && texhash + +RUN echo 'export RSFROOT="$HOME/RSFROOT"' >> $HOME/.bashrc \ + && echo 'source $RSFROOT/share/madagascar/etc/env.sh' >> $HOME/.bashrc + +WORKDIR /root + +CMD ["/bin/bash"] diff --git a/api/python/SConstruct b/api/python/SConstruct index a007e83177..8b28aed75c 100644 --- a/api/python/SConstruct +++ b/api/python/SConstruct @@ -47,7 +47,7 @@ if env.get('SWIG') and env.get('NUMPY'): import numpy numpy_loc = os.path.split(numpy.__file__)[0] pythinc.append(os.path.join(numpy_loc,'numarray','numpy')) - if int(numpy.__version.split(".")[0]) >=2: + if int(numpy.__version__.split(".")[0]) >=2: pythinc.append(os.path.join(numpy_loc,'_core','include')) else: pythinc.append(os.path.join(numpy_loc,'core','include')) diff --git a/configure b/configure index b6bf9d05bb..f017ca255f 100755 --- a/configure +++ b/configure @@ -91,7 +91,7 @@ if test "$scons" = "no"; then dir=`ls -d [Ss][Cc]ons-4.* | grep '[^mz]$'` cd $dir export PYTHONUSERBASE="$root" - $python -m pip install . --user --no-warn-script-location > /dev/null + $python -m pip install . --user --no-warn-script-location --break-system-packages > /dev/null else # if python version <3 archive=`ls [Ss][Cc]ons-3.*.tar.gz`