summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/tests/test_multiarray.py
diff options
context:
space:
mode:
authorMarten van Kerkwijk <mhvk@astro.utoronto.ca>2018-05-22 15:56:50 -0400
committerMarten van Kerkwijk <mhvk@astro.utoronto.ca>2018-05-29 13:57:33 -0400
commit86f487cd9c634f778d7b6ce8184c367d9e423fd6 (patch)
treea9dea39dbf7c978192c061ff63d684c6d9469a9f /numpy/matrixlib/tests/test_multiarray.py
parent11e9d2aa469e6c5ed6fd6ccb29b139ea8e5e58b9 (diff)
downloadnumpy-86f487cd9c634f778d7b6ce8184c367d9e423fd6.tar.gz
TST: Ignore PendingDeprecationWarning in matrixlib tests.
Diffstat (limited to 'numpy/matrixlib/tests/test_multiarray.py')
-rw-r--r--numpy/matrixlib/tests/test_multiarray.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/numpy/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py
index 6d84bd477..2f04b49d6 100644
--- a/numpy/matrixlib/tests/test_multiarray.py
+++ b/numpy/matrixlib/tests/test_multiarray.py
@@ -1,5 +1,13 @@
from __future__ import division, absolute_import, print_function
+# As we are testing matrices, we ignore its PendingDeprecationWarnings
+try:
+ import pytest
+ pytestmark = pytest.mark.filterwarnings(
+ 'ignore:the matrix subclass is not:PendingDeprecationWarning')
+except ImportError:
+ pass
+
import numpy as np
from numpy.testing import assert_, assert_equal, assert_array_equal