Fix yet another deprecation warning

openscm · Jan 23, 2024 · 8643ec3 · 8643ec3
1 parent fd48c82
commit 8643ec3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/scmdata/run.py b/src/scmdata/run.py
@@ -875,7 +875,7 @@ def timeseries(
             raise NonUniqueMetadataError(_meta)
 
         if time_axis is None:
-            columns = self._time_points.to_index()
+            columns = self._time_points.to_index().infer_objects()
         elif time_axis == "year":
             columns = self._time_points.years()
         elif time_axis == "year-month":
@@ -906,8 +906,11 @@ def calc_seconds(x):
         if len(np.unique(columns)) != len(columns):
             raise ValueError(f"Ambiguous time values with time_axis = '{time_axis}'")
 
-        df.columns = pd.Index(columns, name="time")
         df.index = pd.MultiIndex.from_frame(_meta)
+        if isinstance(columns, pd.Index):
+            df.columns = columns
+        else:
+            df.columns = pd.Index(columns, name="time")
 
         if drop_all_nan_times:
             df = df.dropna(how="all", axis="columns")