This is an automated email from the ASF dual-hosted git repository. michaelsmolina pushed a commit to branch 3.0 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 88e6f22180b61f1c3ba15134f2f64064a448ff92 Author: Beto Dealmeida <[email protected]> AuthorDate: Thu Sep 21 13:11:59 2023 -0700 fix: datetime with timezone excel export (#25318) Co-authored-by: Michael S. Molina <[email protected]> (cherry picked from commit 5ebcd2a5f69d2691f1e6c0ffc4a611c728cf4354) --- ...6e5b91_add_on_delete_cascade_for_dashboard_roles.py | 4 ++-- superset/utils/excel.py | 5 +++++ .../excel.py => tests/unit_tests/utils/excel_tests.py | 18 ++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/superset/migrations/versions/2023-09-15_12-58_4b85906e5b91_add_on_delete_cascade_for_dashboard_roles.py b/superset/migrations/versions/2023-09-15_12-58_4b85906e5b91_add_on_delete_cascade_for_dashboard_roles.py index b712aca682..8f429ced9f 100644 --- a/superset/migrations/versions/2023-09-15_12-58_4b85906e5b91_add_on_delete_cascade_for_dashboard_roles.py +++ b/superset/migrations/versions/2023-09-15_12-58_4b85906e5b91_add_on_delete_cascade_for_dashboard_roles.py @@ -17,14 +17,14 @@ """add on delete cascade for dashboard_roles Revision ID: 4b85906e5b91 -Revises: 317970b4400c +Revises: ec54aca4c8a2 Create Date: 2023-09-15 12:58:26.772759 """ # revision identifiers, used by Alembic. revision = "4b85906e5b91" -down_revision = "317970b4400c" +down_revision = "ec54aca4c8a2" from superset.migrations.shared.constraints import ForeignKey, redefine diff --git a/superset/utils/excel.py b/superset/utils/excel.py index 1f68031b64..ccbeadee5e 100644 --- a/superset/utils/excel.py +++ b/superset/utils/excel.py @@ -22,6 +22,11 @@ import pandas as pd def df_to_excel(df: pd.DataFrame, **kwargs: Any) -> Any: output = io.BytesIO() + + # timezones are not supported + for column in df.select_dtypes(include=["datetimetz"]).columns: + df[column] = df[column].astype(str) + # pylint: disable=abstract-class-instantiated with pd.ExcelWriter(output, engine="xlsxwriter") as writer: df.to_excel(writer, **kwargs) diff --git a/superset/utils/excel.py b/tests/unit_tests/utils/excel_tests.py similarity index 67% copy from superset/utils/excel.py copy to tests/unit_tests/utils/excel_tests.py index 1f68031b64..c15f69a0c6 100644 --- a/superset/utils/excel.py +++ b/tests/unit_tests/utils/excel_tests.py @@ -14,16 +14,18 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -import io -from typing import Any + +from datetime import datetime, timezone import pandas as pd +from superset.utils.excel import df_to_excel -def df_to_excel(df: pd.DataFrame, **kwargs: Any) -> Any: - output = io.BytesIO() - # pylint: disable=abstract-class-instantiated - with pd.ExcelWriter(output, engine="xlsxwriter") as writer: - df.to_excel(writer, **kwargs) - return output.getvalue() +def test_timezone_conversion() -> None: + """ + Test that columns with timezones are converted to a string. + """ + df = pd.DataFrame({"dt": [datetime(2023, 1, 1, 0, 0, tzinfo=timezone.utc)]}) + contents = df_to_excel(df) + assert pd.read_excel(contents)["dt"][0] == "2023-01-01 00:00:00+00:00"
