Merge 23db4c0 into 0d4eab0

sncosmo · Dec 6, 2020 · 4707d80 · 4707d80
2 parents 0d4eab0 + 23db4c0
commit 4707d80
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/sncosmo/fitting.py b/sncosmo/fitting.py
@@ -667,10 +667,16 @@ def fit_lc(data=None, model=None, vparam_names=[], bounds=None, spectra=None,
                 ndof += len(spectrum)
         ndof -= len(vparam_names)
 
+        # Minuit keywords changed in v1.4.3. Handle that gracefully.
+        from distutils.version import LooseVersion
+        if LooseVersion(iminuit.__version__) >= LooseVersion("1.4.3"):
+            param_names_kwargs = {'name': model.param_names}
+        else:
+            param_names_kwargs = {'forced_parameters': model.param_names}
+
         m = iminuit.Minuit(fitchisq, errordef=1.,
-                           forced_parameters=model.param_names,
                            print_level=(1 if verbose >= 2 else 0),
-                           throw_nan=True, **kwargs)
+                           throw_nan=True, **param_names_kwargs, **kwargs)
         d, l = m.migrad(ncall=maxcall)
         if verbose:
             print("{} function calls; {} dof.".format(d.nfcn, ndof))
@@ -725,9 +731,8 @@ def fit_lc(data=None, model=None, vparam_names=[], bounds=None, spectra=None,
                                       signature='iminuit', modelcov=modelcov)
 
             m = iminuit.Minuit(fitchisq, errordef=1.,
-                               forced_parameters=model.param_names,
                                print_level=(1 if verbose >= 2 else 0),
-                               throw_nan=True, **kwargs)
+                               throw_nan=True, **param_names_kwargs, **kwargs)
             d, l = m.migrad(ncall=maxcall)
 
             if verbose: