Skip to content

Commit

Permalink
Merge branch 'branch-24.04' into test-cuda-12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham authored Feb 9, 2024
2 parents 0a0bcd0 + e36718b commit 8ef962b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions python/cudf/cudf/tests/test_api_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import cudf
from cudf.api import types
from cudf.core._compat import PANDAS_GE_200, PANDAS_GE_210, PANDAS_GE_214
from cudf.core._compat import PANDAS_GE_210, PANDAS_GE_214, PANDAS_GE_220
from cudf.testing._utils import expect_warning_if


Expand Down Expand Up @@ -499,8 +499,8 @@ def test_is_integer(obj, expect):
(pd.Series(dtype="int"), False),
(pd.Series(dtype="float"), False),
(pd.Series(dtype="complex"), False),
(pd.Series(dtype="str"), not PANDAS_GE_200),
(pd.Series(dtype="unicode"), not PANDAS_GE_200),
(pd.Series(dtype="str"), PANDAS_GE_220),
(pd.Series(dtype="unicode"), PANDAS_GE_220),
(pd.Series(dtype="datetime64[s]"), False),
(pd.Series(dtype="timedelta64[s]"), False),
(pd.Series(dtype="category"), False),
Expand Down

0 comments on commit 8ef962b

Please sign in to comment.