Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manually remove 'z' from datetime string #294

Merged
merged 7 commits into from
Mar 16, 2022
Merged

manually remove 'z' from datetime string #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30a53e7
manually remove 'z' from datetime string
JessicaS11 Mar 16, 2022
0ac3559
add check for zulu character
JessicaS11 Mar 16, 2022
fa00acc
commit else portion
JessicaS11 Mar 16, 2022
076d149
Merge branch 'development' into npdatetime
JessicaS11 Mar 16, 2022
cf1fcfe
check for attribute and actually get last string character
JessicaS11 Mar 16, 2022
35435d1
use endswith instead of numerical indexing
JessicaS11 Mar 16, 2022
a02bc41
GitHub action UML generation auto-update
weiji14 Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/source/user_guide/documentation/classes_dev_uml.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 15 additions & 7 deletions icepyx/core/read.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down