Skip to content

Commit d49efb7

Browse files
committed
add debug trace to failing operation, update dockerimages
1 parent 0b93918 commit d49efb7

File tree

5 files changed

+30
-64
lines changed

5 files changed

+30
-64
lines changed

docker/nipype_test/Dockerfile_base

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,23 @@ ENV MATLABCMD "/opt/mcr/v85/toolbox/matlab" \
9595
SPMMCRCMD "/opt/spm12/run_spm12.sh /opt/mcr/v85/ script" \
9696
FORCE_SPMMCR 1
9797

98+
WORKDIR /root
99+
# Install miniconda
100+
RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
101+
/bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
102+
rm Miniconda3-latest-Linux-x86_64.sh
103+
104+
ENV PATH /usr/local/miniconda/bin:$PATH
105+
106+
# http://bugs.python.org/issue19846
107+
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
108+
ENV LANG C.UTF-8 \
109+
LC_ALL C.UTF-8
110+
111+
# Add conda-forge channel in conda
112+
RUN conda config --add channels conda-forge && \
113+
conda install -y lockfile nipype matplotlib sphinx boto boto3 coverage mock pbr nitime dipy && \
114+
pip install nose-cov doctest-ignore-unicode configparser
98115

99116
CMD ["/bin/bash"]
100117

docker/nipype_test/Dockerfile_py27

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,12 @@
2626
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

29-
FROM nipype/nipype_test:base
29+
FROM nipype/nipype_test:base-0.0.2
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
31-
# Preparations
32-
RUN ln -snf /bin/bash /bin/sh
33-
WORKDIR /root
3431

35-
# Install miniconda
36-
RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
37-
/bin/bash Miniconda-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
38-
rm Miniconda-latest-Linux-x86_64.sh
39-
40-
ENV PATH /usr/local/miniconda/bin:$PATH
41-
42-
# http://bugs.python.org/issue19846
43-
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
44-
ENV LANG C.UTF-8
45-
ENV LC_ALL C.UTF-8
46-
47-
# Add conda-forge channel in conda
48-
RUN conda config --add channels conda-forge && \
49-
conda install -y lockfile nipype matplotlib sphinx boto boto3 coverage mock pbr nitime dipy && \
50-
pip install nose-cov doctest-ignore-unicode configparser
32+
# Downgrade python to 2.7
33+
RUN conda update -y conda && \
34+
conda update --all -y python=2.7
5135

5236
COPY docker/circleci/run_* /usr/bin/
5337
RUN chmod +x /usr/bin/run_*

docker/nipype_test/Dockerfile_py34

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,17 @@
2626
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

29-
FROM nipype/nipype_test:base
29+
FROM nipype/nipype_test:base-0.0.2
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
31-
# Preparations
32-
RUN ln -snf /bin/bash /bin/sh
33-
WORKDIR /root
3431

35-
# Install miniconda
36-
RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
37-
/bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
38-
rm Miniconda3-latest-Linux-x86_64.sh
32+
# Downgrade python to 3.4
33+
RUN conda update -y conda && \
34+
conda update --all -y python=3.4
3935

40-
ENV PATH /usr/local/miniconda/bin:$PATH
41-
42-
# http://bugs.python.org/issue19846
43-
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
44-
ENV LANG C.UTF-8
45-
ENV LC_ALL C.UTF-8
46-
47-
# Add conda-forge channel in conda
48-
RUN conda config --add channels conda-forge && \
49-
conda update -y conda && \
50-
conda update --all -y python=3.4 && \
51-
conda install -y lockfile nipype matplotlib sphinx boto boto3 coverage mock pbr nitime dipy && \
52-
pip install nose-cov doctest-ignore-unicode configparser
53-
5436
COPY docker/circleci/run_* /usr/bin/
5537
RUN chmod +x /usr/bin/run_*
5638

57-
# Replace imglob with Python3 compatible version
39+
# Replace imglob with a Python3 compatible version
5840
COPY nipype/external/fsl_imglob.py /usr/bin/fsl_imglob.py
5941
RUN rm -r ${FSLDIR}/bin/imglob && \
6042
chmod +x /usr/bin/fsl_imglob.py && \

docker/nipype_test/Dockerfile_py35

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,15 @@
2626
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

29-
FROM nipype/nipype_test:base
29+
FROM nipype/nipype_test:base-0.0.2
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
31-
# Preparations
32-
RUN ln -snf /bin/bash /bin/sh
33-
WORKDIR /root
34-
35-
# Install miniconda
36-
RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
37-
/bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
38-
rm Miniconda3-latest-Linux-x86_64.sh
39-
40-
ENV PATH /usr/local/miniconda/bin:$PATH
4131

42-
# http://bugs.python.org/issue19846
43-
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
44-
ENV LANG C.UTF-8
45-
ENV LC_ALL C.UTF-8
46-
47-
# Add conda-forge channel in conda
48-
RUN conda config --add channels conda-forge && \
49-
conda install -y lockfile nipype matplotlib sphinx boto boto3 coverage mock pbr nitime dipy && \
50-
pip install nose-cov doctest-ignore-unicode configparser
32+
WORKDIR /root
5133

5234
COPY docker/circleci/run_* /usr/bin/
5335
RUN chmod +x /usr/bin/run_*
5436

55-
# Replace imglob with Python3 compatible version
37+
# Replace imglob with a Python3 compatible version
5638
COPY nipype/external/fsl_imglob.py /usr/bin/fsl_imglob.py
5739
RUN rm -r ${FSLDIR}/bin/imglob && \
5840
chmod +x /usr/bin/fsl_imglob.py && \

nipype/utils/filemanip.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ def loadcrash(infile, *args):
466466
def loadpkl(infile):
467467
"""Load a zipped or plain cPickled file
468468
"""
469+
fmlogger.debug('Loading pkl: %s', infile)
469470
if infile.endswith('pklz'):
470471
pkl_file = gzip.open(infile, 'rb')
471472
else:

0 commit comments

Comments
 (0)