Skip to content

Commit 6247d12

Browse files
committed
fix fmri_spm_nested, teardown script #1538
1 parent 3cb904e commit 6247d12

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

circle.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ test:
2929
- docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch --entrypoint="/usr/bin/run_nosetests.sh" nipype/testbench :
3030
timeout: 2600
3131
post:
32-
- mkdir -p ${CIRCLE_TEST_REPORTS}/nose
33-
- sudo mv ~/scratch/nosetests.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
34-
- mkdir -p ~/docs
35-
- sudo mv ~/scratch/docs/* ~/docs/
36-
- sudo mv ~/scratch/builddocs.log ~/docs/log.txt
32+
- bash docker/circleci/teardown.sh
3733

3834
general:
3935
artifacts:

docker/circleci/run_builddocs.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ done
55
source activate nipypetests-2.7
66

77
mkdir -p /scratch/docs
8-
set -o pipefail && cd /root/src/nipype/doc && make html 2>&1 | tee /scratch/builddoc.log
8+
set -o pipefail && cd /root/src/nipype/doc && make html 2>&1 | tee /scratch/builddocs.log
99
cp -r /root/src/nipype/doc/_build/html/* /scratch/docs/
1010
chmod 777 -R /scratch/docs
11-
chmod 777 /scratch/builddoc.log
12-
cat /scratch/builddoc.log && if grep -q "ERROR" /scratch/builddoc.log; then false; else true; fi
11+
chmod 777 /scratch/builddocs.log
12+
cat /scratch/builddocs.log && if grep -q "ERROR" /scratch/builddocs.log; then false; else true; fi

docker/circleci/teardown.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
#
3+
# This script puts all artifacts in place after the smoke tests
4+
#
5+
#
6+
set -u
7+
set -e
8+
9+
mkdir -p ${CIRCLE_TEST_REPORTS}/nose
10+
sudo mv ~/scratch/nosetests.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
11+
mkdir -p ~/docs
12+
sudo mv ~/scratch/docs/* ~/docs/
13+
sudo mv ~/scratch/builddocs.log ~/docs/log.txt

examples/fmri_spm_nested.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"""
107107

108108
normalize = pe.Node(interface=spm.Normalize(), name="normalize")
109-
normalize.inputs.template = os.path.abspath('data/T1.nii')
109+
normalize.inputs.template = os.path.abspath('nipype-tutorial/data/T1.nii')
110110

111111

112112
"""Smooth the functional data using

0 commit comments

Comments
 (0)