Merge branch 'main' into tswast-patch-1

Author: tswast

bigframes/operations/datetimes.py

@@ -25,7 +25,7 @@
 from bigframes.core import log_adapter
 import bigframes.operations as ops
 
-_ONE_DAY = pandas.Timedelta("1d")
+_ONE_DAY = pandas.Timedelta("1D")
 _ONE_SECOND = pandas.Timedelta("1s")
 _ONE_MICRO = pandas.Timedelta("1us")
 _SUPPORTED_FREQS = ("Y", "Q", "M", "W", "D", "h", "min", "s", "ms", "us")

conftest.py

@@ -14,13 +14,20 @@
 
 from __future__ import annotations
 
+import warnings
+
 import numpy as np
 import pandas as pd
 import pyarrow as pa
 import pytest
 
 import bigframes._config
 
+# Make sure SettingWithCopyWarning is ignored if it exists.
+# It was removed in pandas 3.0.
+if hasattr(pd.errors, "SettingWithCopyWarning"):
+    warnings.simplefilter("ignore", pd.errors.SettingWithCopyWarning)
+
 
 @pytest.fixture(scope="session")
 def polars_session_or_bpd():

pytest.ini

@@ -1,5 +1,3 @@
 [pytest]
 doctest_optionflags = NORMALIZE_WHITESPACE
-filterwarnings =
-    ignore::pandas.errors.SettingWithCopyWarning
 addopts = "--import-mode=importlib"

tests/unit/test_local_data.py

@@ -44,6 +44,12 @@
 def test_local_data_well_formed_round_trip():
     local_entry = local_data.ManagedArrowTable.from_pandas(pd_data)
     result = pd.DataFrame(local_entry.itertuples(), columns=pd_data.columns)
+    result = result.assign(
+        **{
+            col: result[col].astype(pd_data_normalized[col].dtype)
+            for col in pd_data_normalized.columns
+        }
+    )
     pandas.testing.assert_frame_equal(pd_data_normalized, result, check_dtype=False)
 
 
@@ -118,6 +124,12 @@ def test_local_data_well_formed_round_trip_chunked():
     as_rechunked_pyarrow = pa.Table.from_batches(pa_table.to_batches(max_chunksize=2))
     local_entry = local_data.ManagedArrowTable.from_pyarrow(as_rechunked_pyarrow)
     result = pd.DataFrame(local_entry.itertuples(), columns=pd_data.columns)
+    result = result.assign(
+        **{
+            col: result[col].astype(pd_data_normalized[col].dtype)
+            for col in pd_data_normalized.columns
+        }
+    )
     pandas.testing.assert_frame_equal(pd_data_normalized, result, check_dtype=False)
 
 
@@ -126,6 +138,12 @@ def test_local_data_well_formed_round_trip_sliced():
     as_rechunked_pyarrow = pa.Table.from_batches(pa_table.slice(0, 4).to_batches())
     local_entry = local_data.ManagedArrowTable.from_pyarrow(as_rechunked_pyarrow)
     result = pd.DataFrame(local_entry.itertuples(), columns=pd_data.columns)
+    result = result.assign(
+        **{
+            col: result[col].astype(pd_data_normalized[col].dtype)
+            for col in pd_data_normalized.columns
+        }
+    )
     pandas.testing.assert_frame_equal(
         pd_data_normalized[0:4].reset_index(drop=True),
         result.reset_index(drop=True),