compare as dtype child of np.integer

Author: betaBison

gnss_lib_py/parsers/navdata.py

@@ -121,7 +121,7 @@ def from_pandas_df(self, pandas_df):
 
         dtypes = dict(pandas_df.dtypes)
         for row, dtype in dtypes.items():
-            if np.issubdtype(dtype,int):
+            if np.issubdtype(dtype,np.integer):
                 dtype = np.int64
             self.orig_dtypes[row] = dtype
 
@@ -974,7 +974,7 @@ def __setitem__(self, key_idx, new_value):
                 self.str_map[key_idx] = {}
                 # update original dtype in case of replacing values
                 dtype = np.asarray(new_value).dtype
-                if np.issubdtype(dtype, int):
+                if np.issubdtype(dtype, np.integer):
                     dtype = np.int64
                 self.orig_dtypes[key_idx] = dtype
                 if self.array.shape == (0,0):
@@ -1020,7 +1020,7 @@ def __setitem__(self, key_idx, new_value):
                 # update original dtype in case of replacing values
                 for row_index in rows:
                     dtype = np.asarray(new_value).dtype
-                    if np.issubdtype(dtype, int):
+                    if np.issubdtype(dtype, np.integer):
                         dtype = np.int64
                     self.orig_dtypes[self.inv_map[row_index]] = dtype
 

gnss_lib_py/utils/time_conversions.py

@@ -274,7 +274,7 @@ def unix_millis_to_datetime(unix_millis):
     t_utc : datetime.datetime
         UTC time as a datetime object.
     """
-    if np.issubdtype(type(unix_millis),int) or isinstance(unix_millis,np.ndarray):
+    if np.issubdtype(type(unix_millis), np.integer):
         unix_millis = float(unix_millis)
     t_utc = UNIX_EPOCH_0 + timedelta(milliseconds=unix_millis)
     t_utc = t_utc.replace(tzinfo=timezone.utc)

tests/parsers/test_navdata.py

@@ -575,7 +575,7 @@ def test_replace_mapper_all(df_simple, rows):
                           np.array([10,2,46,67,98,300]))
 
     assert new_navdata["names"].dtype == object
-    assert np.issubdtype(new_navdata["integers"].dtype, int)
+    assert np.issubdtype(new_navdata["integers"].dtype, np.integer)
     assert new_navdata["floats"].dtype == np.float64
     assert new_navdata["strings"].dtype == object
 
@@ -589,7 +589,7 @@ def test_replace_mapper_all(df_simple, rows):
                           np.array([10,2,46,67,98,300]))
 
     assert data_temp["names"].dtype == object
-    assert np.issubdtype(data_temp["integers"].dtype, int)
+    assert np.issubdtype(data_temp["integers"].dtype, np.integer)
     assert data_temp["floats"].dtype == np.float64
     assert data_temp["strings"].dtype == object
 
@@ -634,7 +634,7 @@ def test_replace_mapper_partial(df_simple, rows):
                           np.array([10,2,45,67,98,300]))
 
     assert new_navdata["names"].dtype == object
-    assert np.issubdtype(new_navdata["integers"].dtype, int)
+    assert np.issubdtype(new_navdata["integers"].dtype, np.integer)
     assert new_navdata["floats"].dtype == np.float64
     assert new_navdata["strings"].dtype == object
 
@@ -648,7 +648,7 @@ def test_replace_mapper_partial(df_simple, rows):
                           np.array([10,2,45,67,98,300]))
 
     assert data_temp["names"].dtype == object
-    assert np.issubdtype(data_temp["integers"].dtype, int)
+    assert np.issubdtype(data_temp["integers"].dtype, np.integer)
     assert data_temp["floats"].dtype == np.float64
     assert data_temp["strings"].dtype == object
 
@@ -692,7 +692,7 @@ def test_replace_mapper_type_change(df_simple):
     assert data["names"].dtype == object
     assert data["integers"].dtype == object
     assert data["floats"].dtype == np.float64
-    assert np.issubdtype(data["strings"].dtype, int)
+    assert np.issubdtype(data["strings"].dtype, np.integer)
 
 def test_rename_mapper_and_rows(df_simple):
     """Test data renaming functionality with type changes and row names.

tests/utils/test_time_conversions.py

@@ -205,10 +205,7 @@ def test_datetime_to_unix_millis():
     # Testing reverse conversion
     t_rev = tc.unix_millis_to_datetime(out_unix_millis)
     assert t_datetime == t_rev
-
-    t_rev = tc.unix_millis_to_datetime(np.array(out_unix_millis).astype(np.int64))
-    assert t_datetime == t_rev
-
+    
 
 def test_datetime_to_gps_millis():
     """Test UTC datetime to milliseconds since GPS epoch conversion