Merge pull request #4643 from nicoddemus/asscalar-deprecated

Use a.item() instead of deprecated np.asscalar(a)

Author: asottile

changelog/4643.trivial.rst

@@ -0,0 +1,3 @@
+Use ``a.item()`` instead of the deprecated ``np.asscalar(a)`` in ``pytest.approx``.
+
+``np.asscalar`` has been `deprecated <https://github.com/numpy/numpy/blob/master/doc/release/1.16.0-notes.rst#new-deprecations>`__ in ``numpy 1.16.``.

src/_pytest/python_api.py

@@ -150,10 +150,10 @@ def _yield_comparisons(self, actual):
 
         if np.isscalar(actual):
             for i in np.ndindex(self.expected.shape):
-                yield actual, np.asscalar(self.expected[i])
+                yield actual, self.expected[i].item()
         else:
             for i in np.ndindex(self.expected.shape):
-                yield np.asscalar(actual[i]), np.asscalar(self.expected[i])
+                yield actual[i].item(), self.expected[i].item()
 
 
 class ApproxMapping(ApproxBase):