Merge branch 'master' into lint-2

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+branch = True

.gitignore

@@ -8,3 +8,4 @@ dist/
 DataSpecification.egg-info
 /SpiNNaker_DataSpecification.egg-info/
 .cache/
+.coverage

.travis.yml

@@ -23,15 +23,16 @@ before_install:
 
 install:
   - pip install -r requirements-test.txt
+  - pip install python-coveralls
   - python ./setup.py install
   # C build checks
   - make -C c_data_specification -f test.mk build-test
   # TODO: ensure that the C data spec also builds with the embedded compiler
 
 script:
   # Tests
-  - py.test unittests
-  - py.test integration_tests
+  - py.test unittests --cov data_specification
+  - py.test integration_tests --cov data_specification --cov-append
   - make -C c_data_specification -f test.mk check
   # Code quality check
   - flake8 data_specification
@@ -42,3 +43,7 @@ script:
   - sphinx-build -T -E -b html -d _build/doctrees-readthedocsdirhtml -D language=en . _build/html
   - sphinx-build -T -b json -d _build/doctrees-json -D language=en . _build/json
   - sphinx-build -T -b singlehtml -d _build/doctrees-readthedocssinglehtmllocalmedia -D language=en . _build/localmedia
+
+after_success:
+  - cd $TRAVIS_BUILD_DIR
+  - coveralls

README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/SpiNNakerManchester/DataSpecification.svg?branch=master)](https://travis-ci.org/SpiNNakerManchester/DataSpecification)
+[![Coverage Status](https://coveralls.io/repos/github/SpiNNakerManchester/DataSpecification/badge.svg?branch=master)](https://coveralls.io/github/SpiNNakerManchester/DataSpecification?branch=master)
 
 This package provides utilities for specifying binary data algorithmically,
 and executing the specifications to produce the data.

requirements-test.txt

@@ -1,3 +1,5 @@
 -r requirements.txt
 flake8
+pytest>=2.8
+pytest-cov
 sphinx==1.5.3