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.

Sign up for GitHub

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

Jump to bottom

[REVIEW] xfail failing pytest in pandas 1.2.3 #7507

Merged
merged 3 commits into from
Mar 3, 2021
Merged

[REVIEW] xfail failing pytest in pandas 1.2.3 #7507

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61ccf0f
temporarily pin pandas to 1.2.2
galipremsagar Mar 3, 2021
48cb295
pin pandas to 1.2.3
galipremsagar Mar 3, 2021
7e8a67e
pin pandas to <1.3dev
galipremsagar Mar 3, 2021
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
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.6,<3.8
- numba>=0.49.0,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.3
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.6,<3.8
- numba>=0.49,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.3
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.6,<3.8
- numba>=0.49,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.3
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ requirements:
- protobuf
- python
- typing_extensions
- pandas >=1.0,<1.3.0dev0
- pandas >=1.0,<=1.2.3
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- cupy >7.1.0,<9.0.0a0
- numba >=0.49.0
- numpy
Expand Down
1 change: 1 addition & 0 deletions python/cudf/cudf/core/_compat.py
View file
Open in desktop
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
View file
Open in desktop
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