Merge branch 'fix-scheduled-tests' into 'master'

Fixes the scheduled tests

See merge request lscsoft/bilby!408

.gitlab-ci.yml

@@ -79,18 +79,9 @@ scheduled-python-3.7:
   image: bilbydev/bilby-test-suite-python37
   only:
     - schedules
-  before_script:
-    # Install the dependencies specified in the Pipfile
-    - pipenv install --three --python=/opt/conda/bin/python --system --deploy
   script:
     - python setup.py install
 
-    # Run pyflakes
-    - flake8 .
-
-    # Run tests
-    - pytest
-
     # Run tests which are only done on schedule
     - pytest test/example_test.py
     - pytest test/gw_example_test.py

bilby/core/sampler/dynesty.py

@@ -378,6 +378,7 @@ class Dynesty(NestedSampler):
 
     def _run_test(self):
         import dynesty
+        import pandas as pd
         self.sampler = dynesty.NestedSampler(
             loglikelihood=self.log_likelihood,
             prior_transform=self.prior_transform,
@@ -387,7 +388,8 @@ class Dynesty(NestedSampler):
 
         self.sampler.run_nested(**sampler_kwargs)
 
-        self.result.samples = np.random.uniform(0, 1, (100, self.ndim))
+        self.result.samples = pd.DataFrame(
+            self.priors.sample(100))[self.search_parameter_keys].values
         self.result.log_evidence = np.nan
         self.result.log_evidence_err = np.nan
         return self.result

examples/injection_examples/marginalized_likelihood.py

@@ -48,7 +48,7 @@ priors['geocent_time'] = bilby.core.prior.Uniform(
     name='geocent_time', latex_label='$t_c$', unit='$s$')
 # These parameters will not be sampled
 for key in ['a_1', 'a_2', 'tilt_1', 'tilt_2', 'phi_12', 'phi_jl', 'theta_jn', 'ra',
-            'dec']:
+            'dec', 'mass_1', 'mass_2']:
     priors[key] = injection_parameters[key]
 
 # Initialise GravitationalWaveTransient