Merge pull request #55 from SuperDARN/fix/npstr-dep

FIX: Change np.str to str
SuperDARN · Jan 30, 2023 · 58ffa43 · 58ffa43
2 parents 37ee7d9 + 2939858
commit 58ffa43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pydarnio/borealis/base_format.py b/pydarnio/borealis/base_format.py
@@ -979,7 +979,7 @@ def single_string_fields(cls):
             All the single element string fields in records of the
             format, as a list.
         """
-        return [k for k, v in cls.single_element_types().items() if v == np.str_]
+        return [k for k, v in cls.single_element_types().items() if issubclass(v, str)]
 
     @classmethod
     def array_string_fields(cls):
@@ -993,7 +993,7 @@ def array_string_fields(cls):
             All the fields with arrays of strings in records of the
             format, as a list.
         """
-        return [k for k, v in cls.array_dtypes().items() if v == np.str_]
+        return [k for k, v in cls.array_dtypes().items() if issubclass(v, str)]
 
     @classmethod
     def bool_types(cls):

diff --git a/pydarnio/utils/conversions.py b/pydarnio/utils/conversions.py
@@ -38,8 +38,6 @@
                      np.float32: 'f',
                      np.float64: 'd',
                      str: 's',
-                     np.str_: 's',
-                     np.str: 's',
                      np.int64: 'q',
                      np.uint8: 'B',
                      np.uint16: 'H',