Merge b2aaaf441a into f5843fe588

superset/utils/excel.py

@@ -23,9 +23,11 @@ import pandas as pd
 def df_to_excel(df: pd.DataFrame, **kwargs: Any) -> Any:
     output = io.BytesIO()
 
-    # timezones are not supported
+    #Convert timezone aware datetime to naive datetime
     for column in df.select_dtypes(include=["datetimetz"]).columns:
-        df[column] = df[column].astype(str)
+        if pd.api.types.is_datetime64_any_dtype(df[column]):
+            if df[column].dt.tz is not None:
+                df[column] = df[column].dt.tz_convert(None)
 
     # pylint: disable=abstract-class-instantiated
     with pd.ExcelWriter(output, engine="xlsxwriter") as writer:

tests/unit_tests/utils/excel_datetime_tests.py

@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from datetime import datetime, timezone
+import pandas as pd
+from superset.utils.excel import df_to_excel
+
+
+def test_timezone_conversion() -> None:
+    """
+    Test that columns with timezones are converted to a string.
+    """
+    df = pd.DataFrame({'dt': pd.date_range('2023-01-01', periods=1, tz='UTC')})
+    contents = df_to_excel(df)
+    assert pd.read_excel(contents)['dt'][0] == '2023-01-01 00:00:00+00:00'