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

ci: get cudf tests passing again #1446

Merged
merged 3 commits into from
Nov 25, 2024
Merged

ci: get cudf tests passing again #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
694bd04
ci: get cudf tests passing again
MarcoGorelli Nov 25, 2024
267a20d
fixp
MarcoGorelli Nov 25, 2024
3c7fbe4
coverage
MarcoGorelli Nov 25, 2024
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
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ exclude_also = [
"if (:?self._)?implementation is Implementation.MODIN",
"if (:?self._)?implementation is Implementation.CUDF",
'request.applymarker\(pytest.mark.xfail\)',
'if self._backend_version < '
'if self._backend_version < ',
'if "cudf" in str\(constructor',
]

[tool.mypy]
Expand Down
26 changes: 13 additions & 13 deletions tests/expr_and_series/ewm_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"ignore:`Expr.ewm_mean` is being called from the stable API although considered an unstable feature."
)
def test_ewm_mean_expr(request: pytest.FixtureRequest, constructor: Constructor) -> None:
if any(x in str(constructor) for x in ("pyarrow_table_", "dask", "modin")) or (
"polars" in str(constructor) and POLARS_VERSION < (1,)
):
if any(
x in str(constructor) for x in ("pyarrow_table_", "dask", "modin", "cudf")
) or ("polars" in str(constructor) and POLARS_VERSION < (1,)):
request.applymarker(pytest.mark.xfail)

df = nw.from_native(constructor(data))
Expand All @@ -36,7 +36,7 @@ def test_ewm_mean_expr(request: pytest.FixtureRequest, constructor: Constructor)
def test_ewm_mean_series(
request: pytest.FixtureRequest, constructor_eager: ConstructorEager
) -> None:
if any(x in str(constructor_eager) for x in ("pyarrow_table_", "modin")) or (
if any(x in str(constructor_eager) for x in ("pyarrow_table_", "modin", "cudf")) or (
"polars" in str(constructor_eager) and POLARS_VERSION < (1,)
):
request.applymarker(pytest.mark.xfail)
Expand Down Expand Up @@ -75,9 +75,9 @@ def test_ewm_mean_expr_adjust(
adjust: bool, # noqa: FBT001
expected: dict[str, list[float]],
) -> None:
if any(x in str(constructor) for x in ("pyarrow_table_", "dask", "modin")) or (
"polars" in str(constructor) and POLARS_VERSION < (1,)
):
if any(
x in str(constructor) for x in ("pyarrow_table_", "dask", "modin", "cudf")
) or ("polars" in str(constructor) and POLARS_VERSION < (1,)):
request.applymarker(pytest.mark.xfail)

df = nw.from_native(constructor(data))
Expand Down Expand Up @@ -137,9 +137,9 @@ def test_ewm_mean_nulls(
expected: dict[str, list[float]],
constructor: Constructor,
) -> None:
if any(x in str(constructor) for x in ("pyarrow_table_", "dask", "modin")) or (
"polars" in str(constructor) and POLARS_VERSION < (1,)
):
if any(
x in str(constructor) for x in ("pyarrow_table_", "dask", "modin", "cudf")
) or ("polars" in str(constructor) and POLARS_VERSION < (1,)):
request.applymarker(pytest.mark.xfail)

df = nw.from_native(constructor({"a": [2.0, 4.0, None, 3.0]}))
Expand All @@ -154,9 +154,9 @@ def test_ewm_mean_params(
request: pytest.FixtureRequest,
constructor: Constructor,
) -> None:
if any(x in str(constructor) for x in ("pyarrow_table_", "dask", "modin")) or (
"polars" in str(constructor) and POLARS_VERSION < (1,)
):
if any(
x in str(constructor) for x in ("pyarrow_table_", "dask", "modin", "cudf")
) or ("polars" in str(constructor) and POLARS_VERSION < (1,)):
request.applymarker(pytest.mark.xfail)

df = nw.from_native(constructor({"a": [2, 5, 3]}))
Expand Down
8 changes: 4 additions & 4 deletions tests/expr_and_series/str/to_datetime_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


def test_to_datetime(constructor: Constructor) -> None:
if "cudf" in str(constructor): # pragma: no cover
if "cudf" in str(constructor):
expected = "2020-01-01T12:34:56.000000000"
else:
expected = "2020-01-01 12:34:56"
Expand All @@ -34,7 +34,7 @@ def test_to_datetime(constructor: Constructor) -> None:


def test_to_datetime_series(constructor_eager: ConstructorEager) -> None:
if "cudf" in str(constructor_eager): # pragma: no cover
if "cudf" in str(constructor_eager):
expected = "2020-01-01T12:34:56.000000000"
else:
expected = "2020-01-01 12:34:56"
Expand Down Expand Up @@ -76,7 +76,7 @@ def test_to_datetime_infer_fmt(
) -> None:
if "polars" in str(constructor) and str(data["a"][0]).isdigit():
request.applymarker(pytest.mark.xfail)
if "cudf" in str(constructor): # pragma: no cover
if "cudf" in str(constructor):
expected = expected_cudf
result = (
nw.from_native(constructor(data))
Expand Down Expand Up @@ -117,7 +117,7 @@ def test_to_datetime_series_infer_fmt(
) -> None:
if "polars" in str(constructor_eager) and str(data["a"][0]).isdigit():
request.applymarker(pytest.mark.xfail)
if "cudf" in str(constructor_eager): # pragma: no cover
if "cudf" in str(constructor_eager):
expected = expected_cudf

result = (
Expand Down
11 changes: 8 additions & 3 deletions tests/frame/pivot_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def test_pivot(
index: str | list[str],
request: pytest.FixtureRequest,
) -> None:
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin")):
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin", "cudf")):
request.applymarker(pytest.mark.xfail)
if ("polars" in str(constructor_eager) and POLARS_VERSION < (1, 0)) or (
"pandas" in str(constructor_eager) and PANDAS_VERSION < (1, 1)
Expand Down Expand Up @@ -153,6 +153,11 @@ def test_pivot_no_agg(
) -> None:
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin")):
request.applymarker(pytest.mark.xfail)
if "cudf" in str(constructor_eager):
# The first one fails, the second one passes. Let's just skip
# the test until they address their pivot shortcomings in the next
# release https://github.com/rapidsai/cudf/pull/17373.
return
if ("polars" in str(constructor_eager) and POLARS_VERSION < (1, 0)) or (
"pandas" in str(constructor_eager) and PANDAS_VERSION < (1, 1)
):
Expand All @@ -174,7 +179,7 @@ def test_pivot_no_agg(
def test_pivot_sort_columns(
request: Any, constructor_eager: Any, sort_columns: Any, expected: list[str]
) -> None:
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin")):
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin", "cudf")):
request.applymarker(pytest.mark.xfail)
if ("polars" in str(constructor_eager) and POLARS_VERSION < (1, 0)) or (
"pandas" in str(constructor_eager) and PANDAS_VERSION < (1, 1)
Expand Down Expand Up @@ -224,7 +229,7 @@ def test_pivot_sort_columns(
def test_pivot_names_out(
request: Any, constructor_eager: Any, kwargs: Any, expected: list[str]
) -> None:
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin")):
if any(x in str(constructor_eager) for x in ("pyarrow_table", "modin", "cudf")):
request.applymarker(pytest.mark.xfail)
if ("polars" in str(constructor_eager) and POLARS_VERSION < (1, 0)) or (
"pandas" in str(constructor_eager) and PANDAS_VERSION < (1, 1)
Expand Down
Loading