From d06b58c8fcb7f107a2e3daa90a98b4d6977bd1fb Mon Sep 17 00:00:00 2001 From: Chris Gorgolewski Date: Sun, 31 Jan 2016 18:18:19 -0800 Subject: [PATCH 1/5] enhance circle CI error reporting --- .noserc | 14 ++++++++++++++ circle.yml | 8 ++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 .noserc diff --git a/.noserc b/.noserc new file mode 100644 index 0000000000..ece4001c35 --- /dev/null +++ b/.noserc @@ -0,0 +1,14 @@ +[nosetests] +verbosity=3 + +with-coverage=1 +cover-branches=1 +cover-xml=1 +cover-xml-file=./coverage.xml +cover-min-percentage=66 + +with-profile=1 +profile-restrict=.05 +profile-stats-file=./profile-stats.prof + +with-xunit=1 diff --git a/circle.yml b/circle.yml index 4f0d31d060..3b90622a55 100644 --- a/circle.yml +++ b/circle.yml @@ -21,7 +21,7 @@ dependencies: # Set up python environment - pip install --upgrade pip - pip install -e . - - pip install matplotlib sphinx ipython boto + - pip install matplotlib sphinx ipython boto NoseXUnit - gem install fakes3 - if [[ ! -d ~/examples/data ]]; then wget "http://tcpdiag.dl.sourceforge.net/project/nipy/nipype/nipype-0.2/nipype-tutorial.tar.bz2"; tar jxvf nipype-tutorial.tar.bz2; mkdir ~/examples; mv nipype-tutorial/* ~/examples/; fi - if [[ ! -d ~/examples/fsl_course_data ]]; then wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt1.tar.gz" ; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt2.tar.gz"; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/tbss.tar.gz"; mkdir ~/examples/fsl_course_data; tar zxvf fdt1.tar.gz -C ~/examples/fsl_course_data; tar zxvf fdt2.tar.gz -C ~/examples/fsl_course_data; tar zxvf tbss.tar.gz -C ~/examples/fsl_course_data; fi @@ -32,7 +32,8 @@ machine: FSLOUTPUTTYPE: NIFTI_GZ test: override: - - source $HOME/.profile; nosetests --with-doctest --logging-level=DEBUG --verbosity=3: + - mkdir -p ${CIRCLE_TEST_REPORTS}/nose + - source $HOME/.profile; nosetests --with-doctest --xunit-file="${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml" -c ./.noserc --logging-level=DEBUG --verbosity=3: environment: SPMMCRCMD: "$HOME/spm12/run_spm12.sh $HOME/mcr/v85/ script" FORCE_SPMMCR: 1 @@ -66,3 +67,6 @@ general: artifacts: - "doc/_build/html" - "~/log.txt" + - "nosetests.xml" + - "coverage.xml" + - "profile-stats.prof" From cc6634fc92110f54895f8fb79d5f857267691eaa Mon Sep 17 00:00:00 2001 From: Chris Filo Gorgolewski Date: Sun, 31 Jan 2016 18:34:27 -0800 Subject: [PATCH 2/5] actually xunit support is built in --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3b90622a55..088d18c3fb 100644 --- a/circle.yml +++ b/circle.yml @@ -21,7 +21,7 @@ dependencies: # Set up python environment - pip install --upgrade pip - pip install -e . - - pip install matplotlib sphinx ipython boto NoseXUnit + - pip install matplotlib sphinx ipython boto - gem install fakes3 - if [[ ! -d ~/examples/data ]]; then wget "http://tcpdiag.dl.sourceforge.net/project/nipy/nipype/nipype-0.2/nipype-tutorial.tar.bz2"; tar jxvf nipype-tutorial.tar.bz2; mkdir ~/examples; mv nipype-tutorial/* ~/examples/; fi - if [[ ! -d ~/examples/fsl_course_data ]]; then wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt1.tar.gz" ; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt2.tar.gz"; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/tbss.tar.gz"; mkdir ~/examples/fsl_course_data; tar zxvf fdt1.tar.gz -C ~/examples/fsl_course_data; tar zxvf fdt2.tar.gz -C ~/examples/fsl_course_data; tar zxvf tbss.tar.gz -C ~/examples/fsl_course_data; fi From 86211b9e16b85f6e9bc4a4bd5ade046c5a6e0c5d Mon Sep 17 00:00:00 2001 From: Chris Filo Gorgolewski Date: Sun, 31 Jan 2016 18:54:06 -0800 Subject: [PATCH 3/5] remove profiling --- .noserc | 3 --- 1 file changed, 3 deletions(-) diff --git a/.noserc b/.noserc index ece4001c35..6317017c66 100644 --- a/.noserc +++ b/.noserc @@ -7,8 +7,5 @@ cover-xml=1 cover-xml-file=./coverage.xml cover-min-percentage=66 -with-profile=1 -profile-restrict=.05 -profile-stats-file=./profile-stats.prof with-xunit=1 From 423dd2c06195ed2ef60c7a8bcd565f4e8660bac2 Mon Sep 17 00:00:00 2001 From: Chris Filo Gorgolewski Date: Sun, 31 Jan 2016 18:55:12 -0800 Subject: [PATCH 4/5] added coverage deps --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 088d18c3fb..1c2bd98b09 100644 --- a/circle.yml +++ b/circle.yml @@ -21,7 +21,7 @@ dependencies: # Set up python environment - pip install --upgrade pip - pip install -e . - - pip install matplotlib sphinx ipython boto + - pip install matplotlib sphinx ipython boto coverage - gem install fakes3 - if [[ ! -d ~/examples/data ]]; then wget "http://tcpdiag.dl.sourceforge.net/project/nipy/nipype/nipype-0.2/nipype-tutorial.tar.bz2"; tar jxvf nipype-tutorial.tar.bz2; mkdir ~/examples; mv nipype-tutorial/* ~/examples/; fi - if [[ ! -d ~/examples/fsl_course_data ]]; then wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt1.tar.gz" ; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt2.tar.gz"; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/tbss.tar.gz"; mkdir ~/examples/fsl_course_data; tar zxvf fdt1.tar.gz -C ~/examples/fsl_course_data; tar zxvf fdt2.tar.gz -C ~/examples/fsl_course_data; tar zxvf tbss.tar.gz -C ~/examples/fsl_course_data; fi @@ -69,4 +69,3 @@ general: - "~/log.txt" - "nosetests.xml" - "coverage.xml" - - "profile-stats.prof" From cf2bea01962c28bc0d6bcb8b2247f876c2e6bd83 Mon Sep 17 00:00:00 2001 From: Chris Gorgolewski Date: Mon, 1 Feb 2016 08:50:59 -0800 Subject: [PATCH 5/5] lower coverage requirement to 50% --- .noserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.noserc b/.noserc index 6317017c66..b1e08d21c9 100644 --- a/.noserc +++ b/.noserc @@ -5,7 +5,7 @@ with-coverage=1 cover-branches=1 cover-xml=1 cover-xml-file=./coverage.xml -cover-min-percentage=66 +cover-min-percentage=50 with-xunit=1