From f1b1d49abbd5c80ea36cc2670f938a47591c0ae0 Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Thu, 4 Mar 2021 15:16:29 +0000 Subject: [PATCH] NUMPY: remove deprecated type aliases [MPY-301] --- metview/bindings.py | 4 ++-- tests/test_metview.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metview/bindings.py b/metview/bindings.py index 8f830c23..c321df42 100644 --- a/metview/bindings.py +++ b/metview/bindings.py @@ -378,11 +378,11 @@ def push_vector(npa): elif dtype == np.float32: # can directly pass the data buffer cffi_buffer = ffi.cast("float*", npa.ctypes.data) lib.p_push_vector_from_float32_array(cffi_buffer, len(npa), np.nan) - elif dtype == np.bool: # convert first to float32 + elif dtype == bool: # convert first to float32 f32_array = npa.astype(np.float32) cffi_buffer = ffi.cast("float*", f32_array.ctypes.data) lib.p_push_vector_from_float32_array(cffi_buffer, len(f32_array), np.nan) - elif dtype == np.int: # convert first to float64 + elif dtype == int: # convert first to float64 f64_array = npa.astype(np.float64) cffi_buffer = ffi.cast("double*", f64_array.ctypes.data) lib.p_push_vector_from_double_array(cffi_buffer, len(f64_array), np.nan) diff --git a/tests/test_metview.py b/tests/test_metview.py index c1bae579..f818d2ee 100644 --- a/tests/test_metview.py +++ b/tests/test_metview.py @@ -1672,7 +1672,7 @@ def test_set_vector_float32_from_numpy_array(): def test_set_vector_10_bool_from_numpy_array(): - r = np.array([1, 0, 0, 1, 1, 0, 1], dtype=np.bool) + r = np.array([1, 0, 0, 1, 1, 0, 1], dtype=bool) assert mv.type(r) == "vector" assert mv.dtype(r) == "float32" assert mv.count(r) == 7 @@ -1680,7 +1680,7 @@ def test_set_vector_10_bool_from_numpy_array(): def test_set_vector_TF_bool_from_numpy_array(): - r = np.array([True, False, False, True, True, False, True], dtype=np.bool) + r = np.array([True, False, False, True, True, False, True], dtype=bool) assert mv.type(r) == "vector" assert mv.dtype(r) == "float32" assert mv.count(r) == 7 @@ -1688,7 +1688,7 @@ def test_set_vector_TF_bool_from_numpy_array(): def test_set_vector_from_int_numpy_array(): - r = np.array([5, 8, 7, 1, 2900], dtype=np.int) + r = np.array([5, 8, 7, 1, 2900], dtype=int) assert mv.type(r) == "vector" assert mv.dtype(r) == "float64" assert mv.count(r) == 5