Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REVIEW] xfail failing pytest in pandas 1.2.3 #7507

Merged
merged 3 commits into from
Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions python/cudf/cudf/core/_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
PANDAS_GE_100 = PANDAS_VERSION >= version.parse("1.0")
PANDAS_GE_110 = PANDAS_VERSION >= version.parse("1.1")
PANDAS_GE_120 = PANDAS_VERSION >= version.parse("1.2")
PANDAS_EQ_123 = PANDAS_VERSION == version.parse("1.2.3")
7 changes: 3 additions & 4 deletions python/cudf/cudf/tests/test_setitem.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import pytest

import cudf
from cudf.core._compat import PANDAS_GE_120
from cudf.core._compat import PANDAS_EQ_123, PANDAS_GE_120
from cudf.tests.utils import assert_eq, assert_exceptions_equal


Expand All @@ -21,9 +21,8 @@ def test_dataframe_setitem_bool_mask_scaler(df, arg, value):


@pytest.mark.xfail(
condition=not PANDAS_GE_120,
reason="pandas incorrectly adds nulls with dataframes "
"but works fine with scalars",
condition=PANDAS_EQ_123 or not PANDAS_GE_120,
reason="https://github.com/pandas-dev/pandas/issues/40204",
)
def test_dataframe_setitem_scaler_bool():
df = pd.DataFrame({"a": [1, 2, 3]})
Expand Down