From 75c0c7994fa9d52f1c100b062c7873f5786f3972 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 17 Jan 2024 13:56:15 +0000 Subject: [PATCH] Fix for pandas 2.x (#103) * Fix pandas.to_datetime usage * Allow backward compatibility * Add changelog --- docs/release_notes.rst | 5 +++++ src/viresclient/__init__.py | 2 +- src/viresclient/_client.py | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index bb2a280..04f763f 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -4,6 +4,11 @@ Release notes Change log ---------- +Changes from 0.11.4 to 0.11.5 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- Fix :py:meth:`viresclient.SwarmRequest.available_times` usage with pandas 2.x + Changes from 0.11.3 to 0.11.4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/viresclient/__init__.py b/src/viresclient/__init__.py index 766d31a..4dc4284 100644 --- a/src/viresclient/__init__.py +++ b/src/viresclient/__init__.py @@ -35,4 +35,4 @@ from ._config import ClientConfig, set_token from ._data_handling import ReturnedData, ReturnedDataFile -__version__ = "0.11.4" +__version__ = "0.11.5" diff --git a/src/viresclient/_client.py b/src/viresclient/_client.py index 9dfd462..c53c7ab 100644 --- a/src/viresclient/_client.py +++ b/src/viresclient/_client.py @@ -671,6 +671,10 @@ def available_times(self, collection, start_time=None, end_time=None): response = self._get(request, asynchronous=False, show_progress=False) df = read_csv(StringIO(str(response, "utf-8"))) # Convert to datetime objects - df["starttime"] = to_datetime(df["starttime"]) - df["endtime"] = to_datetime(df["endtime"]) + try: + df["starttime"] = to_datetime(df["starttime"], format="ISO8601") + df["endtime"] = to_datetime(df["endtime"], format="ISO8601") + except ValueError: + df["starttime"] = to_datetime(df["starttime"]) + df["endtime"] = to_datetime(df["endtime"]) return df