From 4d94edfee3a5398cd4e7f1afd68aa3457a1931b2 Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Thu, 11 May 2017 17:17:09 -0400
Subject: [PATCH 1/3] Fix Travis package conflicts

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a486fea0..5dbf6432 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,9 +88,11 @@ install:
     - conda install --yes scikit-image==0.12.3
     - conda install --yes opencv==2.4.10
 
-    - pip install --no-cache-dir -r $girder_path/plugins/large_image/requirements.txt
+    # This version of large_image has some conflicts in its requirements.txt, so install manually
+    - pip install enum34==1.1.6 jsonschema==2.5.1 repoze.lru==0.6 libtiff==0.4.0
+#    - pip install --no-cache-dir -r $girder_path/plugins/large_image/requirements.txt
     # We won't have all the system requirements for openslide
-    - pip uninstall --yes openslide-python
+#    - pip uninstall --yes openslide-python
 
     - npm install
 

From ce66e925ce022f793d292dd5491f1895774ba8d1 Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Thu, 11 May 2017 17:48:00 -0400
Subject: [PATCH 2/3] Build testing with Node v6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5dbf6432..89a5f3ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ before_install:
     - pip install --no-cache-dir -U pip virtualenv
 
     - unset PREFIX
-    - nvm install v4.8.2
+    - nvm install v6.10.3
     - npm install -g npm
     - node --version
     - npm --version

From 1faaa6de3524295a4b6bcf9d28542213aa781ad4 Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Thu, 11 May 2017 17:59:34 -0400
Subject: [PATCH 3/3] Enable testing coverage

---
 .travis.yml | 11 +++++++----
 readme.rst  |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89a5f3ec..23f48e88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,6 @@ before_install:
     - WORKER_VERSION=2cfb739c096c2373f8bbe00853e3709f433192a6
     - LARGE_IMAGE_VERSION=60c32b11abb4d5f0d1696221a7e81ab21c611980
     - export MONGO_VERSION=3.4.2
-    - export PY_COVG="ON"
 
     - main_path=$PWD
     - build_path=$PWD/build
@@ -62,6 +61,7 @@ before_install:
     - source $build_path/miniconda/bin/activate $build_path/miniconda
     - conda update --yes --all
     - pip install --no-cache-dir -U pip virtualenv
+    - pip install codecov
 
     - unset PREFIX
     - nvm install v6.10.3
@@ -101,7 +101,10 @@ script:
 #    - python -m girder_worker &
     - mkdir -p $build_path/girder_testing_build
     - cd $build_path/girder_testing_build
-    - cmake -DPYTHON_COVERAGE:BOOL=${PY_COVG} -DPYTHON_VERSION:STRING=${TRAVIS_PYTHON_VERSION} -DRUN_CORE_TESTS:BOOL=OFF -DTEST_PLUGINS:STRING="isic_archive" $girder_path
+    - cmake -DPYTHON_COVERAGE:BOOL=ON -DCOVERAGE_MINIMUM_PASS:STRING=40 -DPYTHON_VERSION:STRING=${TRAVIS_PYTHON_VERSION} -DRUN_CORE_TESTS:BOOL=OFF -DTEST_PLUGINS:STRING="isic_archive" $girder_path
     - make
-    # js_coverage_combine_report and py_coverage* fail due to an upstream bug
-    - JASMINE_TIMEOUT=15000 ctest -VV -E '(py|js)_coverage'
+    # js_coverage_combine_report may fail due to an upstream bug
+    - JASMINE_TIMEOUT=15000 ctest -VV -E 'js_coverage'
+
+after_success:
+    - codecov --root $main_path --disable search pycov --file $build_path/girder_testing_build/coverage.xml
diff --git a/readme.rst b/readme.rst
index 9b746e1b..bf500c2c 100644
--- a/readme.rst
+++ b/readme.rst
@@ -1,4 +1,4 @@
-ISIC Archive |build-status| |license-badge|
+ISIC Archive |build-status| |coverage-badge| |license-badge|
 ===========================================
 International Skin Imaging Collaboration: Melanoma Project
 ----------------------------------------------------------
@@ -116,6 +116,10 @@ Usage
     :target: https://travis-ci.org/ImageMarkup/isic-archive
     :alt: Build Status
 
+.. |coverage-badge| image:: https://codecov.io/gh/ImageMarkup/isic-archive/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/ImageMarkup/isic-archive
+    :alt: Code Coverage
+
 .. |license-badge| image:: https://img.shields.io/github/license/ImageMarkup/isic-archive.svg
     :target: https://raw.githubusercontent.com/ImageMarkup/isic-archive/master/LICENSE
     :alt: License