Fix for pandas 2.x (#103)

* Fix pandas.to_datetime usage * Allow backward compatibility * Add changelog
ESA-VirES · Jan 17, 2024 · 75c0c79 · 75c0c79
1 parent ae1d8d0
commit 75c0c79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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