Merge branch 'add-back-python-36-test' into 'master'

Adds back the python36 test

See merge request !695

.gitlab-ci.yml

@@ -71,13 +71,13 @@ python-3.7:
       - docs/_build/html/
 
 # test example on python 3.6
-#python-3.6:
-#  stage: test
-#  image: bilbydev/v2-dockerfile-test-suite-python36
-#  script:
-#    - python -m pip install .
-#
-#    - pytest
+python-3.6:
+  stage: test
+  image: bilbydev/v2-dockerfile-test-suite-python36
+  script:
+    - python -m pip install .
+
+    - pytest
 
 # Tests run at a fixed schedule rather than on push
 scheduled-python-3.7:

test/sampler_test.py

@@ -526,7 +526,7 @@ class TestRunningSamplers(unittest.TestCase):
     def test_run_cpnest(self):
         _ = bilby.run_sampler(
             likelihood=self.likelihood, priors=self.priors, sampler='cpnest',
-            nlive=100, save=False)
+            nlive=100, save=False, resume=False)
 
     def test_run_dynesty(self):
         _ = bilby.run_sampler(