Skip to content

Commit bb2f996

Browse files
committed
move everything to scratch, build docs #1538
1 parent aadbbfe commit bb2f996

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ RUN mkdir -p .nipype && \
3838
echo 'interface_level = DEBUG' >> .nipype/nipype.cfg && \
3939
echo 'filemanip_level = DEBUG' >> .nipype/nipype.cfg
4040

41-
WORKDIR /root/src
41+
ADD docker/circleci/run_* /usr/bin/
42+
RUN chmod +x /usr/bin/run_*
43+
44+
# Install this branch's code
45+
WORKDIR /scratch/src
4246
ADD . nipype/
4347

4448
# Install the checked out version of nipype, check that requirements are
@@ -58,9 +62,6 @@ RUN cd nipype/ && \
5862
pip install -r requirements.txt && \
5963
pip install -e .
6064

61-
WORKDIR /root/
62-
ADD docker/circleci/run_* /usr/bin/
63-
RUN chmod +x /usr/bin/run_*
6465
WORKDIR /scratch
6566

6667
# RUN echo 'source /etc/profile.d/nipype_tests.sh' >> /etc/bash.bashrc

circle.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies:
1919

2020
test:
2121
override:
22+
- docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch --entrypoint="/usr/bin/run_builddocs.sh" nipype/testbench
2223
- docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench test_spm Linear workflow3d workflow4d :
2324
timeout: 1600
2425
- docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_fsl_feeds Linear l1pipeline

docker/circleci/run_builddocs.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
for i in /etc/profile.d/*.sh; do
3+
source $i
4+
done
5+
source activate nipypetests-2.7
6+
7+
set -o pipefail && cd /scratch/src/nipype/doc && make html 2>&1 | tee /scratch/builddoc.log
8+
cat /scratch/builddoc.log && if grep -q "ERROR" /scratch/builddoc.log; then false; else true; fi
9+

docker/circleci/run_examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ for i in /etc/profile.d/*.sh; do
33
source $i
44
done
55
source activate nipypetests-2.7
6-
python /root/src/nipype/tools/run_examples.py $@
6+
python /scratch/src/nipype/tools/run_examples.py $@

docker/circleci/run_nosetests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ for i in /etc/profile.d/*.sh; do
33
source $i
44
done
55
source activate nipypetests-2.7
6+
cd src/nipype
67
nosetests --with-doctest -c ./.noserc --logging-level=DEBUG --verbosity=3 $@

0 commit comments

Comments
 (0)