Clean up behaviour checking for the cpnest version

bilby/core/sampler/cpnest.py

@@ -84,17 +84,22 @@ class Cpnest(NestedSampler):
 
         self._resolve_proposal_functions()
         model = Model(self.search_parameter_keys, self.priors)
-        try:
-            out = CPNest(model, **self.kwargs)
-        except TypeError as e:
-            if 'proposals' in self.kwargs.keys():
-                logger.warning('YOU ARE TRYING TO USE PROPOSALS IN A VERSION OF CPNEST THAT DOES'
-                               'NOT ACCEPT CUSTOM PROPOSALS. SAMPLING WILL COMMENCE WITH THE DEFAULT'
-                               'PROPOSALS.')
-                del self.kwargs['proposals']
+        out = None
+        remove_kwargs = ["proposals", "n_periodic_checkpoint"]
+        while out is None:
+            try:
                 out = CPNest(model, **self.kwargs)
-            else:
-                raise TypeError(e)
+            except TypeError as e:
+                if len(remove_kwargs) > 0:
+                    kwarg = remove_kwargs.pop(0)
+                else:
+                    raise TypeError("Unable to initialise cpnest sampler")
+                logger.info(
+                    "CPNest init. failed with error {}, please update"
+                    .format(e))
+                logger.info(
+                    "Attempting to rerun with kwarg {} removed".format(kwarg))
+                self.kwargs.pop(kwarg)
         out.run()
 
         if self.plot: