fix: use np.exceptions.VisibleDeprecationWarning

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

pyproject.toml

@@ -87,7 +87,7 @@ log_cli_level = "INFO"
 testpaths = ["tests"]
 xfail_strict = true
 filterwarnings = [
-    "error::numpy.VisibleDeprecationWarning",
+    "error::numpy.exceptions.VisibleDeprecationWarning",
     "error::PendingDeprecationWarning",
     "error::DeprecationWarning",
     "error::FutureWarning",

src/iminuit/_deprecated.py

@@ -1,5 +1,5 @@
 import warnings
-from numpy import VisibleDeprecationWarning
+from numpy.exceptions import VisibleDeprecationWarning
 
 
 class deprecated:

src/iminuit/cost.py

@@ -1754,7 +1754,7 @@ def __init__(
         if method == "hpd":
             warnings.warn(
                 "key 'hpd' is deprecated, please use 'da' instead",
-                category=np.VisibleDeprecationWarning,
+                category=np.exceptions.VisibleDeprecationWarning,
                 stacklevel=2,
             )
 
@@ -2504,7 +2504,7 @@ def __getattr__(name: str) -> Any:
         new_name, obj = _deprecated_content[name]
         warnings.warn(
             f"{name} was renamed to {new_name}, please import {new_name} instead",
-            np.VisibleDeprecationWarning,
+            np.exceptions.VisibleDeprecationWarning,
             stacklevel=2,
         )
         return obj

tests/test_cost.py

@@ -321,7 +321,7 @@ def test_UnbinnedNLL_visualize(log):
     c.visualize((1, 2), model_points=np.linspace(1, 1000))
 
     with pytest.warns(
-        np.VisibleDeprecationWarning, match="keyword 'nbins' is deprecated"
+        np.exceptions.VisibleDeprecationWarning, match="keyword 'nbins' is deprecated"
     ):
         c.visualize((1, 2), nbins=20)
 
@@ -1909,23 +1909,23 @@ def test_Template_pulls():
 def test_deprecated():
     from iminuit import cost
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         from iminuit.cost import BarlowBeestonLite
     assert BarlowBeestonLite is cost.Template
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         from iminuit.cost import barlow_beeston_lite_chi2_jsc
     assert barlow_beeston_lite_chi2_jsc is cost.template_chi2_jsc
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         from iminuit.cost import barlow_beeston_lite_chi2_hpd
     assert barlow_beeston_lite_chi2_hpd is cost.template_chi2_da
 
 
 def test_deprecated_Template_method():
     from iminuit import cost
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         t = Template([1], [2, 3], [[1], [2]], method="hpd")
         t._impl is cost.template_chi2_da
 
@@ -1967,7 +1967,7 @@ def cdf(xye, a):
 def test_BohmZechTransform():
     from iminuit.cost import BohmZechTransform
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         val = np.array([1.0, 2.0])
         var = np.array([3.0, 4.0])
         tr = BohmZechTransform(val, var)

tests/test_deprecated.py

@@ -8,7 +8,7 @@ def test_deprecated_func():
     def func(x):
         pass
 
-    with pytest.warns(np.VisibleDeprecationWarning, match="func is deprecated: bla"):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning, match="func is deprecated: bla"):
         func(1)
 
 
@@ -20,7 +20,7 @@ def some_function(x, y, foo):
     some_function(1, 2, foo=3)
 
     with pytest.warns(
-        np.VisibleDeprecationWarning,
+        np.exceptions.VisibleDeprecationWarning,
         match="keyword 'bar' is deprecated, please use 'foo'",
     ):
         some_function(1, 2, bar=3)

tests/test_describe.py

@@ -94,7 +94,7 @@ def __init__(self):
         def __call__(self, *args):
             pass
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         assert describe(A()) == ["x", "y"]
 
 

tests/test_minuit.py

@@ -193,7 +193,7 @@ def test_Func1():
 
 
 def test_Func2():
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         func_test_helper(Func2())
 
 

tests/test_util.py

@@ -450,12 +450,12 @@ def fcn(y, x):
 
 
 def test_make_func_code():
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         fc = util.make_func_code(["a", "b"])
     assert fc.co_varnames == ("a", "b")
     assert fc.co_argcount == 2
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         fc = util.make_func_code(("x",))
     assert fc.co_varnames == ("x",)
     assert fc.co_argcount == 1
@@ -530,14 +530,14 @@ def test_propagate_1():
     def fn(x):
         return 2 * x + 1
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         y, ycov = util.propagate(fn, x, cov)
     np.testing.assert_allclose(y, [3, 5, 7])
     np.testing.assert_allclose(
         ycov, [[4, 0.4, 0.8], [0.4, 8, 1.2], [0.8, 1.2, 12]], rtol=1e-3
     )
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         y, ycov = util.propagate(fn, [1], [[2]])
     np.testing.assert_allclose(y, 3)
     np.testing.assert_allclose(ycov, 8, rtol=1e-3)
@@ -557,15 +557,15 @@ def test_propagate_2():
     def fn(x):
         return np.dot(a, x)
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         y, ycov = util.propagate(fn, x, cov)
     np.testing.assert_equal(y, fn(x))
     np.testing.assert_allclose(ycov, np.einsum("ij,kl,jl", a, a, cov), rtol=1e-3)
 
     def fn(x):
         return np.linalg.multi_dot([x.T, cov, x])
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         y, ycov = util.propagate(fn, x, cov)
     np.testing.assert_equal(y, fn(np.array(x)))
     jac = 2 * np.dot(cov, x)
@@ -585,7 +585,7 @@ def test_propagate_3():
     def fn(x):
         return 2 * x + 1
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         y, ycov = util.propagate(fn, x, cov)
     np.testing.assert_allclose(y, [3, 5, 7])
     np.testing.assert_allclose(ycov, [[4, 0.0, 0.8], [0.0, 0.0, 0.0], [0.8, 0.0, 12]])
@@ -599,16 +599,16 @@ def test_propagate_on_bad_input():
     def fn(x):
         return 2 * x + 1
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         with pytest.raises(ValueError):
             util.propagate(fn, x, cov)
 
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         with pytest.raises(ValueError):
             util.propagate(fn, x, 1)
 
     cov = [[1.0], [1.0]]
-    with pytest.warns(np.VisibleDeprecationWarning):
+    with pytest.warns(np.exceptions.VisibleDeprecationWarning):
         with pytest.raises(ValueError):
             util.propagate(fn, x, cov)