diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b020f03c55e75a26bcf036f698610d4ed941bd8e..f426e45d175031e9f8654244aecb303c1d3fb16f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ python-3.7: - flake8 . # Run tests and collect coverage data - - pytest --cov=bilby + - pytest --cov=bilby --durations 10 - coverage html - coverage-badge -o coverage_badge.svg -f @@ -75,10 +75,28 @@ python-3.6: - pytest +# test samplers on python 3.7 +python-3.7-samplers: + stage: test + image: bilbydev/v2-dockerfile-test-suite-python37 + script: + - python -m pip install . + + - pytest test/sampler_test.py --durations 10 + +# test samplers on python 3.6 +python-3.6-samplers: + stage: test + image: bilbydev/v2-dockerfile-test-suite-python36 + script: + - python -m pip install . + + - pytest test/sampler_test.py + # Tests run at a fixed schedule rather than on push scheduled-python-3.7: stage: test - image: bilbydev/bilby-test-suite-python37 + image: bilbydev/v2-dockerfile-test-suite-python37 only: - schedules script: diff --git a/setup.cfg b/setup.cfg index a7a69fe9f033787df2a7eab72d3f56e6f3f6db48..fad8e426f7aece3c1095427bd83748ca9d1255a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,6 +9,7 @@ addopts = --ignore test/gw_example_test.py --ignore test/example_test.py --ignore test/sample_from_the_prior_test.py + --ignore test/sampler_test.py [metadata] license_file = LICENSE.md diff --git a/test/sampler_test.py b/test/sampler_test.py index 7a80eac6fd8d838604b59aca2d873e7328db5120..d91e76df50e3d774f1fc243ece61272e6395b2cf 100644 --- a/test/sampler_test.py +++ b/test/sampler_test.py @@ -552,7 +552,8 @@ class TestRunningSamplers(unittest.TestCase): def test_run_dynamic_dynesty(self): _ = bilby.run_sampler( likelihood=self.likelihood, priors=self.priors, sampler='dynamic_dynesty', - nlive=100, save=False) + nlive_init=100, nlive_batch=100, dlogz_init=1.0, maxbatch=0, + maxcall=100, bound="single", save=False) def test_run_emcee(self): _ = bilby.run_sampler(