change var name to options, update based on this, add to notes, remov…

…e test

src/iminuit/minuit.py

@@ -1034,7 +1034,11 @@ def scipy(
         the tolerance :attr:`tol` has no effect on SciPy minimizers.
 
         You can specify convergence tolerance and other options for the SciPy minimizers
-        through the `options` parameter.
+        through the `options` parameter. Note that providing the SciPy options 
+        `"maxiter"`, `"maxfev"`, and/or `"maxfun"` (depending on the minimizer) takes 
+        precedence over providing a value for `ncall`. If you want to explicitly control 
+        the number of iterations or function evaluations for a particular SciPy minimizer, 
+        you should provide values for all of its relevant options.
         """
         try:
             from scipy.optimize import (
@@ -1051,9 +1055,6 @@ def scipy(
         if ncall is None:
             ncall = self._migrad_maxcall()
 
-        if type(options) is not dict:
-            raise ValueError("options must be a dictionary")
-
         cfree = ~np.array(self.fixed[:], dtype=bool)
         cpar = np.array(self.values[:])
         no_fixed_parameters = np.all(cfree)
@@ -1239,24 +1240,26 @@ def __call__(self, par, v):
 
         # attempt to set default number of function evaluations if not provided
         # various workarounds for API inconsistencies in scipy.optimize.minimize
+        added_maxiter = False
         if "maxiter" not in options:
-            scipy_options["maxiter"] = ncall
+            options["maxiter"] = ncall
+            added_maxiter = True
         if method in (
             "Nelder-Mead",
             "Powell",
         ):
             if "maxfev" not in options:
-                scipy_options["maxfev"] = ncall
+                options["maxfev"] = ncall
 
-            if "maxiter" not in options:
-                del scipy_options["maxiter"]
+            if added_maxiter:
+                del options["maxiter"]
 
         if method in ("L-BFGS-B", "TNC"):
             if "maxfun" not in options:
-                scipy_options["maxfun"] = ncall
+                options["maxfun"] = ncall
 
-            if "maxiter" not in options:
-                del scipy_options["maxiter"]
+            if added_maxiter:
+                del options["maxiter"]
 
         if method in ("COBYLA", "SLSQP", "trust-constr") and constraints is None:
             constraints = ()
@@ -1276,7 +1279,7 @@ def __call__(self, par, v):
                 hess=hess,
                 hessp=hessp,
                 constraints=constraints,
-                options=scipy_options,
+                options=options,
             )
         if self.print_level > 0:
             print(r)

tests/test_scipy.py

@@ -231,12 +231,6 @@ def test_bad_constraint():
         m.scipy(constraints=[{}])
 
 
-def test_bad_options():
-    m = Minuit(fcn, a=1, b=2)
-    with pytest.raises(ValueError):
-        m.scipy(options=[])
-
-
 def test_high_print_level(capsys):
     m = Minuit(fcn, a=1, b=2)
     m.scipy()