summaryrefslogtreecommitdiff
path: root/numpy/testing
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2019-05-28 09:59:45 +0300
committerGitHub <noreply@github.com>2019-05-28 09:59:45 +0300
commitab439ecf59da8e41140866fa03b7353789a3029f (patch)
tree7baf6424ebc481051693476ab5f41132a65666ff /numpy/testing
parent635349ef5306c50acf55ed0a144d18b00a2a2afa (diff)
parent9216a1dd5391013bf0670bb3d9d07ef68c3b7d66 (diff)
downloadnumpy-ab439ecf59da8e41140866fa03b7353789a3029f.tar.gz
Merge pull request #13627 from shoyer/revert-nep18-impl
MAINT: revert __skip_array_function__ from NEP-18
Diffstat (limited to 'numpy/testing')
-rw-r--r--numpy/testing/tests/test_utils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
index 4247b6589..bf60772d3 100644
--- a/numpy/testing/tests/test_utils.py
+++ b/numpy/testing/tests/test_utils.py
@@ -17,6 +17,7 @@ from numpy.testing import (
clear_and_catch_warnings, suppress_warnings, assert_string_equal, assert_,
tempdir, temppath, assert_no_gc_cycles, HAS_REFCOUNT
)
+from numpy.core.overrides import ARRAY_FUNCTION_ENABLED
class _GenericTest(object):
@@ -179,6 +180,8 @@ class TestArrayEqual(_GenericTest):
self._test_not_equal(a, b)
self._test_not_equal(b, a)
+ @pytest.mark.skipif(
+ not ARRAY_FUNCTION_ENABLED, reason='requires __array_function__')
def test_subclass_that_does_not_implement_npall(self):
class MyArray(np.ndarray):
def __array_function__(self, *args, **kwargs):