Skip to content

Commit 841bc64

Browse files
committed
fix for column name comparison in pandas bin op
1 parent ded5c1e commit 841bc64

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

bigframes/core/blocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2471,7 +2471,7 @@ def _align_series_block_axis_1(
24712471
def _align_pd_series_axis_1(
24722472
self, other: pd.Series, how: str
24732473
) -> Tuple[Block, pd.Index, Sequence[Tuple[ex.RefOrConstant, ex.RefOrConstant]]]:
2474-
if self.column_labels.equals(other.index):
2474+
if self.column_labels.astype("object").equals(other.index.astype("object")):
24752475
columns, lcol_indexer, rcol_indexer = self.column_labels, None, None
24762476
else:
24772477
if not (self.column_labels.is_unique and other.index.is_unique):

noxfile.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
"3.11",
4747
]
4848

49-
# pytest-retry is not yet compatible with pytest 8.x.
50-
# https://github.com/str0zzapreti/pytest-retry/issues/32
51-
PYTEST_VERSION = "pytest<8.0.0dev"
49+
PYTEST_VERSION = "pytest==8.4.2"
5250
SPHINX_VERSION = "sphinx==4.5.0"
5351
LINT_PATHS = [
5452
"docs",

tests/unit/core/compile/sqlglot/expressions/snapshots/test_blob_ops/test_obj_get_access_url/out.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ WITH `bfcte_0` AS (
2121
)
2222
SELECT
2323
`bfcol_0` AS `rowindex`,
24-
`bfcol_10` AS `0`
24+
`bfcol_10` AS `string_col`
2525
FROM `bfcte_3`

tests/unit/test_dataframe_polars.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2319,7 +2319,8 @@ def test_binop_with_self_aggregate(session, scalars_dfs):
23192319
df_columns = ["int64_col", "float64_col", "int64_too"]
23202320

23212321
bf_df = scalars_df[df_columns]
2322-
bf_result = (bf_df - bf_df.mean()).to_pandas()
2322+
bf_deviation = bf_df - bf_df.mean()
2323+
bf_result = bf_deviation.to_pandas()
23232324

23242325
pd_df = scalars_pandas_df[df_columns]
23252326
pd_result = pd_df - pd_df.mean()

0 commit comments

Comments
 (0)