Skip to content

Commit

Permalink
Merge pull request #410 from ImageMarkup/coverage
Browse files Browse the repository at this point in the history
Enable testing coverage
  • Loading branch information
brianhelba authored May 12, 2017
2 parents 1a06c6c + 1faaa6d commit 87a04e0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
19 changes: 12 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -62,9 +61,10 @@ 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 v4.8.2
- nvm install v6.10.3
- npm install -g npm
- node --version
- npm --version
Expand All @@ -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

Expand All @@ -99,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
6 changes: 5 additions & 1 deletion readme.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ISIC Archive |build-status| |license-badge|
ISIC Archive |build-status| |coverage-badge| |license-badge|
===========================================
International Skin Imaging Collaboration: Melanoma Project
----------------------------------------------------------
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 87a04e0

Please sign in to comment.