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

Fix parquet pytest failures with pandas-2.0 #13474

Merged
merged 1 commit into from
May 31, 2023
Merged

Fix parquet pytest failures with pandas-2.0 #13474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 48 additions & 2 deletions python/cudf/cudf/tests/test_parquet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1749,6 +1749,15 @@ def test_parquet_partitioned(tmpdir_factory, cols, filename):

# Check that cudf and pd return the same read
got_cudf = cudf.read_parquet(gdf_dir)
if PANDAS_GE_200 and isinstance(got_pd["c"].dtype, pd.CategoricalDtype):
# Work-around for pandas bug:
# https://github.com/pandas-dev/pandas/issues/53345
got_pd["c"] = got_pd["c"].astype(
pd.CategoricalDtype(
categories=got_pd["c"].dtype.categories.astype("int64"),
ordered=got_pd["c"].dtype.ordered,
)
)
assert_eq(got_pd, got_cudf)

# If filename is specified, check that it is correct
Expand Down Expand Up @@ -1796,6 +1805,15 @@ def test_parquet_writer_chunked_partitioned(tmpdir_factory, return_meta):

# Check that cudf and pd return the same read
got_cudf = cudf.read_parquet(gdf_dir)
if PANDAS_GE_200:
# Work-around for pandas bug:
# https://github.com/pandas-dev/pandas/issues/53345
got_pd["a"] = got_pd["a"].astype(
pd.CategoricalDtype(
categories=got_pd["a"].dtype.categories.astype("int64"),
ordered=got_pd["a"].dtype.ordered,
)
)
assert_eq(got_pd, got_cudf)


Expand Down Expand Up @@ -1836,7 +1854,15 @@ def test_parquet_writer_chunked_max_file_size(

# Check that cudf and pd return the same read
got_cudf = cudf.read_parquet(gdf_dir)

if PANDAS_GE_200:
# Work-around for pandas bug:
# https://github.com/pandas-dev/pandas/issues/53345
got_pd["a"] = got_pd["a"].astype(
pd.CategoricalDtype(
categories=got_pd["a"].dtype.categories.astype("int64"),
ordered=got_pd["a"].dtype.ordered,
)
)
assert_eq(
got_pd.sort_values(["b"]).reset_index(drop=True),
got_cudf.sort_values(["b"]).reset_index(drop=True),
Expand Down Expand Up @@ -1882,6 +1908,15 @@ def test_parquet_writer_chunked_partitioned_context(tmpdir_factory):

# Check that cudf and pd return the same read
got_cudf = cudf.read_parquet(gdf_dir)
if PANDAS_GE_200:
# Work-around for pandas bug:
# https://github.com/pandas-dev/pandas/issues/53345
got_pd["a"] = got_pd["a"].astype(
pd.CategoricalDtype(
categories=got_pd["a"].dtype.categories.astype("int64"),
ordered=got_pd["a"].dtype.ordered,
)
)
assert_eq(got_pd, got_cudf)


Expand Down Expand Up @@ -1989,6 +2024,15 @@ def test_read_parquet_partitioned_filtered(
filters = [[("a", "==", 10)], [("c", "==", 1)]]
got = cudf.read_parquet(read_path, filters=filters)
expect = pd.read_parquet(read_path, filters=filters)
if PANDAS_GE_200:
# Work-around for pandas bug:
# https://github.com/pandas-dev/pandas/issues/53345
expect["c"] = expect["c"].astype(
pd.CategoricalDtype(
categories=expect["c"].dtype.categories.astype("int64"),
ordered=expect["c"].dtype.ordered,
)
)
assert_eq(expect, got)


Expand Down Expand Up @@ -2803,7 +2847,9 @@ def test_parquet_roundtrip_time_delta():
)
buffer = BytesIO()
df.to_parquet(buffer)
assert_eq(df, cudf.read_parquet(buffer))
# TODO: Remove `check_dtype` once following issue is fixed in arrow:
# https://github.com/apache/arrow/issues/33321
assert_eq(df, cudf.read_parquet(buffer), check_dtype=not PANDAS_GE_200)


def test_parquet_reader_malformed_file(datadir):
Expand Down