Merge branch 'master' of git.ligo.org:Monash/tupak

.gitlab-ci.yml

@@ -26,17 +26,19 @@ exitcode-jessie:
     - pip install coverage-badge
   script:
     - python setup.py install
+    # Run tests and collect coverage data
     - coverage erase
-    - coverage run --source=tupak/ -a test/conversion_tests.py
-    - coverage run --source=tupak/ -a test/detector_tests.py
-    - coverage run --source=tupak/ -a test/prior_tests.py
-    - coverage run --source=tupak/ -a test/sampler_tests.py
-    - coverage run --source=tupak/ -a test/waveform_generator_tests.py
-    - coverage run --omit=* -a test/example_tests.py
-    - coverage run --omit=* -a test/noise_realisation_tests.py
-    - coverage run --omit=* -a test/tests.py
+    - coverage run --source=tupak/core/,tupak/gw/ -a test/conversion_tests.py
+    - coverage run --source=tupak/core/,tupak/gw/ -a test/detector_tests.py
+    - coverage run --source=tupak/core/,tupak/gw/ -a test/prior_tests.py
+    - coverage run --source=tupak/core/,tupak/gw/ -a test/sampler_tests.py
+    - coverage run --source=tupak/core/,tupak/gw/ -a test/waveform_generator_tests.py
     - coverage html
     - coverage-badge -o coverage_badge.svg -f
+    # Run all other tests (no coverage data collected)
+    - python test/example_tests.py
+    - python test/noise_realisation_tests.py
+    - python test/tests.py
 
     # Make the documentation
     - pip install -r docs/requirements.txt