diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-08-01 17:40:56 +0000 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-08-05 21:50:05 -0500 |
| commit | fb004f8bc610b0cf52342d35314a9e0a0434e745 (patch) | |
| tree | 8de75b4b5dcd1db1f6356c65701b7c1a6c47a2e7 /numpy/lib/tests | |
| parent | 6a119c982463097aebc8d004fc731b424721a650 (diff) | |
| download | numpy-fb004f8bc610b0cf52342d35314a9e0a0434e745.tar.gz | |
MAINT: Stop using the undocumented coercion-then-downcast feature of subdtype
Diffstat (limited to 'numpy/lib/tests')
| -rw-r--r-- | numpy/lib/tests/test_function_base.py | 8 | ||||
| -rw-r--r-- | numpy/lib/tests/test_index_tricks.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_type_check.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py index ad840f8ef..151c20a4b 100644 --- a/numpy/lib/tests/test_function_base.py +++ b/numpy/lib/tests/test_function_base.py @@ -1711,16 +1711,16 @@ class TestHistogram(object): # Check the type of the returned histogram a = np.arange(10) + .5 h, b = histogram(a) - assert_(np.issubdtype(h.dtype, int)) + assert_(np.issubdtype(h.dtype, np.integer)) h, b = histogram(a, normed=True) - assert_(np.issubdtype(h.dtype, float)) + assert_(np.issubdtype(h.dtype, np.floating)) h, b = histogram(a, weights=np.ones(10, int)) - assert_(np.issubdtype(h.dtype, int)) + assert_(np.issubdtype(h.dtype, np.integer)) h, b = histogram(a, weights=np.ones(10, float)) - assert_(np.issubdtype(h.dtype, float)) + assert_(np.issubdtype(h.dtype, np.floating)) def test_f32_rounding(self): # gh-4799, check that the rounding of the edges works with float32 diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py index f06406c9e..452b3d6a2 100644 --- a/numpy/lib/tests/test_index_tricks.py +++ b/numpy/lib/tests/test_index_tricks.py @@ -243,7 +243,7 @@ class TestIx_(object): for k, (a, sz) in enumerate(zip(arrays, sizes)): assert_equal(a.shape[k], sz) assert_(all(sh == 1 for j, sh in enumerate(a.shape) if j != k)) - assert_(np.issubdtype(a.dtype, int)) + assert_(np.issubdtype(a.dtype, np.integer)) def test_bool(self): bool_a = [True, False, True, True] diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py index d863e5924..e05079981 100644 --- a/numpy/lib/tests/test_type_check.py +++ b/numpy/lib/tests/test_type_check.py @@ -420,7 +420,7 @@ class TestArrayConversion(object): def test_asfarray(self): a = asfarray(np.array([1, 2, 3])) assert_equal(a.__class__, np.ndarray) - assert_(np.issubdtype(a.dtype, float)) + assert_(np.issubdtype(a.dtype, np.floating)) if __name__ == "__main__": run_module_suite() |