diff --git a/doc/source/user_guide/documentation/classes_dev_uml.svg b/doc/source/user_guide/documentation/classes_dev_uml.svg index 2732caf45..a494bc220 100644 --- a/doc/source/user_guide/documentation/classes_dev_uml.svg +++ b/doc/source/user_guide/documentation/classes_dev_uml.svg @@ -18,7 +18,7 @@ capability_url email netrc : NoneType -pswd : str, NoneType +pswd : NoneType, str session : Session uid @@ -163,7 +163,7 @@ Parameters -_fmted_keys : dict, NoneType +_fmted_keys : NoneType, dict _poss_keys : dict _reqtype : str, NoneType fmted_keys @@ -249,7 +249,7 @@ _version : NoneType path : NoneType product : NoneType -wanted : dict, NoneType +wanted : NoneType, dict __init__(vartype, avail, wanted, session, product, version, path) _check_valid_lists(vgrp, allpaths, var_list, beam_list, keyword_list) diff --git a/icepyx/core/read.py b/icepyx/core/read.py index e1624c2d6..ac6fbc1ca 100644 --- a/icepyx/core/read.py +++ b/icepyx/core/read.py @@ -363,13 +363,21 @@ def _add_var_to_ds(is2ds, ds, grp_path, wanted_groups_tiered, wanted_dict): pass try: - # DevNote: these lines may cause a NumPy Warning, as explained here: https://numpy.org/doc/stable/release/1.11.0-notes.html? - # The below line will silence this warning... - # warnings.filterwarnings( - # "default", category=DeprecationWarning, module=np.astype() - # ) - is2ds["data_start_utc"] = is2ds.data_start_utc.astype(np.datetime64) - is2ds["data_end_utc"] = is2ds.data_end_utc.astype(np.datetime64) + if ( + hasattr(is2ds, "data_start_utc") + and is2ds["data_start_utc"].data[0].astype(str).endswith("Z") + ): + # manually remove 'Z' from datetime to allow conversion to np.datetime64 object (support for timezones is deprecated and causes a seg fault) + is2ds["data_start_utc"] = np.datetime64( + is2ds.data_start_utc.data[0].astype(str)[:-1] + ) + is2ds["data_end_utc"] = np.datetime64( + is2ds.data_end_utc.data[0].astype(str)[:-1] + ) + else: + is2ds["data_start_utc"] = is2ds.data_start_utc.astype(np.datetime64) + is2ds["data_end_utc"] = is2ds.data_end_utc.astype(np.datetime64) + except AttributeError: pass