Skip to content

Set date_format to ISO8601 to silence pandas 2.0 UserWarning on read_csv #2569

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

Merged
seisman merged 4 commits into from
Jun 9, 2023
Merged

Set date_format to ISO8601 to silence pandas 2.0 UserWarning on read_csv #2569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
615a585
Set date_format to ISO8601 to silence pandas 2.0 UserWarning on read_csv
weiji14 Jun 9, 2023
fa2a6d3
Handle backwards compatibility for pandas<2
weiji14 Jun 9, 2023
146a7f4
Missed an asterisk
weiji14 Jun 9, 2023
7303e44
Disable pull_request tests on ci_tests_legacy
weiji14 Jun 9, 2023
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
3 changes: 2 additions & 1 deletion pygmt/src/x2sys_cross.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def tempfile_from_dftrack(track, suffix):
sep="\t",
index=False,
na_rep="NaN", # write a NaN value explicitly instead of a blank string
date_format="%Y-%m-%dT%H:%M:%S.%fZ",
date_format="%Y-%m-%dT%H:%M:%S.%fZ", # ISO8601 format
)
yield tmpfilename
finally:
Expand Down Expand Up @@ -235,6 +235,7 @@ def x2sys_cross(tracks=None, outfile=None, **kwargs):
header=2, # Column names are on 2nd row
comment=">", # Skip the 3rd row with a ">"
parse_dates=[2, 3], # Datetimes on 3rd and 4th column
date_format="ISO8601",
Copy link
Member Author

@weiji14 weiji14 Jun 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This date_format parameter only works with pandas>=2.0. Do we want to set a minimum version of pandas, or make things backwards compatible with pandas=1.x?

Copy link
Member

@seisman seisman Jun 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make things backwards compatible with pandas=1.x?

This would be better.

Copy link
Member Author

@weiji14 weiji14 Jun 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, compatibility with pandas=1.x and 2.x should be done in fa2a6d3 and 146a7f4. I've also changed ci_tests_legacy to run with pandas<2 as a check.

)
# Remove the "# " from "# x" in the first column
table = table.rename(columns={table.columns[0]: table.columns[0][2:]})
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_x2sys_cross.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def test_x2sys_cross_input_two_dataframes(mock_x2sys_home):
for i in range(2):
np.random.seed(seed=i)
track = pd.DataFrame(data=np.random.rand(10, 3), columns=("x", "y", "z"))
track["time"] = pd.date_range(start=f"2020-{i}1-01", periods=10, freq="ms")
track["time"] = pd.date_range(start=f"2020-{i}1-01", periods=10, freq="min")
tracks.append(track)

output = x2sys_cross(tracks=tracks, tag=tag, coe="e")
Expand Down