Merge remote-tracking branch 'upstream/master' into enh/SphinxExtension-workflows

Author: oesteban

.circle/tests.sh

@@ -37,3 +37,7 @@ case ${CIRCLE_NODE_INDEX} in
     docker run --rm=false -it -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py35 /usr/bin/run_examples.sh fmri_fsl_reuse Linear /data/examples/ level1_workflow
     ;;
 esac
+
+cp ${WORKDIR}/tests/*.xml ${CIRCLE_TEST_REPORTS}/tests/
+codecov -f "coverage*.xml" -s "${WORKDIR}/tests/" -R "${HOME}/nipype/" -F unittests -e CIRCLE_NODE_INDEX
+codecov -f "smoketest*.xml" -s "${WORKDIR}/tests/" -R "${HOME}/nipype/" -F smoketests -e CIRCLE_NODE_INDEX

circle.yml

@@ -50,12 +50,6 @@ test:
     - bash .circle/tests.sh :
         timeout: 7200
         parallel: true
-  post:
-    # Place reports in the appropriate folder
-    - cp ${WORKDIR}/tests/*.xml ${CIRCLE_TEST_REPORTS}/tests/
-    # Send coverage data to codecov.io
-    - codecov -f "coverage*.xml" -s "${WORKDIR}/tests/" -R "${HOME}/nipype/" -F unittests -v -K
-    - codecov -f "smoketest*.xml" -s "${WORKDIR}/tests/" -R "${HOME}/nipype/" -F smoketests -v -K
 
 general:
   artifacts: