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

Let pygmt.info load datetime columns into a str dtype array #960

Merged
merged 3 commits into from
Mar 3, 2021
Merged

Let pygmt.info load datetime columns into a str dtype array #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b38109
Let pygmt.info load datetime columns into a str dtype array
weiji14 Feb 24, 2021
04507a4
Merge branch 'master' into info_load_datetime_as_str
weiji14 Mar 3, 2021
f0dc337
Use common alias coltypes (f) in tests and make a note on the workaround
weiji14 Mar 3, 2021
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: 5 additions & 1 deletion pygmt/src/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ def info(table, **kwargs):
# instead of a raw string that is less useful.
if result.startswith(("-R", "-T")): # e.g. -R0/1/2/3 or -T0/9/1
result = result[2:].replace("/", " ")
result = np.loadtxt(result.splitlines())
try:
result = np.loadtxt(result.splitlines())
except ValueError:
# Load non-numerical outputs in str type, e.g. for datetime
result = np.loadtxt(result.splitlines(), dtype="str")
weiji14 marked this conversation as resolved.
Show resolved Hide resolved

return result
27 changes: 27 additions & 0 deletions pygmt/tests/test_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ def test_info_dataframe():
assert output == expected_output


def test_info_numpy_array_time_column():
"""
Make sure info works on a numpy.ndarray input with a datetime type.
"""
table = pd.date_range(start="2020-01-01", periods=5).to_numpy()
# Please remove coltypes="0T" workaround after
# https://github.com/GenericMappingTools/gmt/issues/4241 is resolved
output = info(table=table, coltypes="0T")
expected_output = (
"<vector memory>: N = 5 <2020-01-01T00:00:00/2020-01-05T00:00:00>\n"
)
assert output == expected_output


@pytest.mark.xfail(
reason="UNIX timestamps returned instead of ISO datetime, should work on GMT 6.2.0 "
"after https://github.com/GenericMappingTools/gmt/issues/4241 is resolved",
Expand Down Expand Up @@ -115,6 +129,19 @@ def test_info_per_column():
)


def test_info_per_column_with_time_inputs():
"""
Make sure the per_column option works with time inputs.
"""
table = pd.date_range(start="2020-01-01", periods=5).to_numpy()
# Please remove coltypes="0T" workaround after
# https://github.com/GenericMappingTools/gmt/issues/4241 is resolved
output = info(table=table, per_column=True, coltypes="0T")
npt.assert_equal(
actual=output, desired=["2020-01-01T00:00:00", "2020-01-05T00:00:00"]
)


def test_info_spacing():
"""
Make sure the spacing option works.
Expand Down