updated type names for 2.0

Author: flexatone

performance/__main__.py

@@ -507,9 +507,9 @@ def __init__(self):
         self.values = [
                 np.longlong(-1), np.int_(-1), np.intc(-1), np.short(-1), np.byte(-1),
                 np.ubyte(1), np.ushort(1), np.uintc(1), np.uint(1), np.ulonglong(1),
-                np.half(1.0), np.single(1.0), np.float_(1.0), np.longfloat(1.0),
-                np.csingle(1.0j), np.complex_(1.0j), np.clongfloat(1.0j),
-                np.bool_(0), np.str_('1'), np.unicode_('1'), np.void(1),
+                np.half(1.0), np.single(1.0), np.float64(1.0), np.longdouble(1.0),
+                np.csingle(1.0j), np.complex_(1.0j), np.clongdouble(1.0j),
+                np.bool_(0), np.str_('1'), np.str_('1'), np.void(1),
                 np.object(), np.datetime64('NaT'), np.timedelta64('NaT'), np.nan,
                 12, 12.0, True, None, float('NaN'), object(), (1, 2, 3),
                 NT(1, 2, 3), datetime.date(2020, 12, 31), datetime.timedelta(14),

src/methods.c

@@ -558,7 +558,6 @@ isna_element(PyObject *m, PyObject *args, PyObject *kwargs)
         Py_complex val = ((PyComplexObject*)element)->cval;
         return PyBool_FromLong(isnan(val.real) || isnan(val.imag));
     }
-    // TODO: fix!
     if (PyArray_IsScalar(element, Complex64)) {
         npy_cfloat val = PyArrayScalar_VAL(element, Complex64);
         return PyBool_FromLong(isnan(npy_creal(val)) || isnan(npy_cimag(val)));

test/test_util.py

@@ -527,11 +527,11 @@ def test_dtype_from_element_core_dtypes(self) -> None:
                 np.ulonglong,
                 np.half,
                 np.single,
-                np.float_,
-                np.longfloat,
+                np.float64,
+                np.longdouble,
                 np.csingle,
-                np.complex_,
-                np.clongfloat,
+                np.complex128,
+                np.clongdouble,
                 np.bool_,
         ]
         for dtype in dtypes:
@@ -540,12 +540,12 @@ def test_dtype_from_element_core_dtypes(self) -> None:
     def test_dtype_from_element_str_and_misc_dtypes(self) -> None:
         dtype_obj_pairs = [
                 (np.dtype('<U1'), np.str_('1')),
-                (np.dtype('<U1'), np.unicode_('1')),
+                (np.dtype('<U1'), np.str_('1')),
                 (np.dtype('V1'), np.void(1)),
                 (np.dtype('O'), object),
                 (np.dtype('<M8'), np.datetime64('NaT')),
                 (np.dtype('<m8'), np.timedelta64('NaT')),
-                (np.float_, np.nan),
+                (np.float64, np.nan),
         ]
         for dtype, obj in dtype_obj_pairs:
             self.assertEqual(dtype, dtype_from_element(obj))