simplify things

Author: chrisgorgo

circle.yml

@@ -25,7 +25,6 @@ dependencies:
         timeout: 1600
     - mkdir -p ~/docker; docker save nipype/nipype_test:py27 > ~/docker/image.tar :
         timeout: 1600
-    - pip install xunitmerge
 
 test:
   override:
@@ -50,15 +49,10 @@ test:
 
   post:
     - bash docker/circleci/teardown.sh
-    - bash <(curl -s https://codecov.io/bash) -f ~/nosetest*.xml -t ac172a50-8e66-42e5-8822-5373fcf54686 -cF unittests
-    - bash <(curl -s https://codecov.io/bash) -f ~/smoketest*.xml -t ac172a50-8e66-42e5-8822-5373fcf54686 -cF smoketests
+    - bash <(curl -s https://codecov.io/bash) -f ${CIRCLE_TEST_REPORTS}/nose/coverage*.xml -t ac172a50-8e66-42e5-8822-5373fcf54686 -F unittests
+    - bash <(curl -s https://codecov.io/bash) -f ${CIRCLE_TEST_REPORTS}/nose/smoketest*.xml -t ac172a50-8e66-42e5-8822-5373fcf54686 -F smoketests
 
 general:
   artifacts:
     - "~/docs"
     - "~/logs"
-    - "~/coverage_py27.xml"
-    - "~/coverage_py35.xml"
-    - "~/nosetests_py27.xml"
-    - "~/nosetests_py35.xml"
-    - "~/scratch"

docker/circleci/teardown.sh

@@ -7,8 +7,7 @@ set -u
 set -e
 
 mkdir -p ${CIRCLE_TEST_REPORTS}/nose
-xunitmerge ~/scratch/nosetests*.xml ~/scratch/smoketest*.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
-sudo mv ~/scratch/*.xml ~/
+sudo mv ~/scratch/*.xml ${CIRCLE_TEST_REPORTS}/nose
 mkdir -p ~/docs
 sudo mv ~/scratch/docs/* ~/docs/
 mkdir -p ~/logs