From c57dc67401fbd922474f4fff98333c820f566eb4 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Thu, 11 Jan 2024 20:30:39 +0000 Subject: [PATCH 1/3] Fix pandas.to_datetime usage --- src/viresclient/__init__.py | 2 +- src/viresclient/_client.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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..701977d 100644 --- a/src/viresclient/_client.py +++ b/src/viresclient/_client.py @@ -671,6 +671,6 @@ 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"]) + df["starttime"] = to_datetime(df["starttime"], format="ISO8601") + df["endtime"] = to_datetime(df["endtime"], format="ISO8601") return df From ef09e936e03d2222cc8d6e18c9691422516164a8 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 17 Jan 2024 13:48:28 +0000 Subject: [PATCH 2/3] Allow backward compatibility --- src/viresclient/_client.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/viresclient/_client.py b/src/viresclient/_client.py index 701977d..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"], format="ISO8601") - df["endtime"] = to_datetime(df["endtime"], format="ISO8601") + 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 From 968549d3a381e3ecab09b7c05413720a517eab3a Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 17 Jan 2024 13:48:40 +0000 Subject: [PATCH 3/3] Add changelog --- docs/release_notes.rst | 5 +++++ 1 file changed, 5 insertions(+) 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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^