diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2023-05-13 11:02:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 11:02:49 -0600 |
| commit | 5187067d7ad176ee3614beab2b99a524dd719aa8 (patch) | |
| tree | 907997d0c294f550193322aaa73237c1a7bcfaa6 /numpy/core/tests/test_numerictypes.py | |
| parent | b786189222ac5bf2f4efbb04399261f7f760bc18 (diff) | |
| parent | 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c (diff) | |
| download | numpy-5187067d7ad176ee3614beab2b99a524dd719aa8.tar.gz | |
Merge branch 'main' into deprecate-find-common-type
Diffstat (limited to 'numpy/core/tests/test_numerictypes.py')
| -rw-r--r-- | numpy/core/tests/test_numerictypes.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/core/tests/test_numerictypes.py b/numpy/core/tests/test_numerictypes.py index 6aedbf569..bab5bf246 100644 --- a/numpy/core/tests/test_numerictypes.py +++ b/numpy/core/tests/test_numerictypes.py @@ -448,8 +448,9 @@ class TestSctypeDict: # alias for np.int_, but np.long is not supported for historical # reasons (gh-21063) assert_(np.sctypeDict['ulong'] is np.uint) - assert_(not hasattr(np, 'ulong')) - + with pytest.warns(FutureWarning): + # We will probably allow this in the future: + assert not hasattr(np, 'ulong') class TestBitName: def test_abstract(self): @@ -477,7 +478,8 @@ class TestMaximumSctype: def test_complex(self, t): assert_equal(np.maximum_sctype(t), np.sctypes['complex'][-1]) - @pytest.mark.parametrize('t', [np.bool_, np.object_, np.unicode_, np.bytes_, np.void]) + @pytest.mark.parametrize('t', [np.bool_, np.object_, np.str_, np.bytes_, + np.void]) def test_other(self, t): assert_equal(np.maximum_sctype(t), t) @@ -489,7 +491,7 @@ class Test_sctype2char: def test_scalar_type(self): assert_equal(np.sctype2char(np.double), 'd') assert_equal(np.sctype2char(np.int_), 'l') - assert_equal(np.sctype2char(np.unicode_), 'U') + assert_equal(np.sctype2char(np.str_), 'U') assert_equal(np.sctype2char(np.bytes_), 'S') def test_other_type(self): |