Skip to content

Commit e4c4fb8

Browse files
committed
pytest
1 parent 5cf045b commit e4c4fb8

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

tests/test_pandas.py

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,8 @@ def test_unique() -> None:
665665
pd.unique(pd.timedelta_range(start="1 day", periods=4)),
666666
np_1darray[np.timedelta64],
667667
),
668-
np_1darray[np.timedelta64] if PD_LTE_23 else pd.Index,
668+
np_1darray if PD_LTE_23 else pd.Index,
669+
np.timedelta64 if PD_LTE_23 else pd.Timedelta,
669670
)
670671

671672

@@ -984,10 +985,11 @@ def test_index_unqiue() -> None:
984985
mi = pd.MultiIndex.from_product([["a", "b"], ["apple", "banana"]])
985986
interval_i = pd.interval_range(1, 10, periods=10)
986987

987-
check(assert_type(pd.unique(ci), pd.CategoricalIndex[str]), pd.CategoricalIndex)
988+
check(assert_type(pd.unique(ci), "pd.CategoricalIndex[str]"), pd.CategoricalIndex)
988989
check(
989990
assert_type(pd.unique(dti), np_1darray[np.datetime64]),
990991
np.ndarray if PD_LTE_23 else pd.Index,
992+
np.datetime64 if PD_LTE_23 else pd.Timestamp,
991993
)
992994
check(assert_type(pd.unique(i), np_1darray), np.ndarray if PD_LTE_23 else pd.Index)
993995
check(assert_type(pd.unique(pi), pd.PeriodIndex), pd.PeriodIndex)
@@ -1030,13 +1032,9 @@ def test_cut() -> None:
10301032
g = pd.cut(pd.Series([1, 2, 3, 4, 5, 6, 7, 8]), 4, precision=1, duplicates="drop")
10311033
h = pd.cut(pd.Series([1, 2, 3, 4, 5, 6, 7, 8]), 4, labels=False, duplicates="raise")
10321034
i = pd.cut(pd.Series([1, 2, 3, 4, 5, 6, 7, 8]), 4, labels=["1", "2", "3", "4"])
1033-
check(assert_type(g, pd.Series[Any, pd.Categorical]), pd.Series, pd.Interval[float])
1034-
check(assert_type(h, pd.Series[Any, pd.Categorical]), pd.Series, pd.Interval[float])
1035-
check(
1036-
assert_type(i, pd.Series[Any, pd.Categorical]),
1037-
pd.Series,
1038-
pd.Interval[float],
1039-
)
1035+
check(assert_type(g, "pd.Series[Any, pd.Categorical]"), pd.Series, pd.Interval)
1036+
check(assert_type(h, "pd.Series[Any, pd.Categorical]"), pd.Series, np.integer)
1037+
check(assert_type(i, "pd.Series[Any, pd.Categorical]"), pd.Series, str)
10401038

10411039
j0, j1 = pd.cut(
10421040
pd.Series([1, 2, 3, 4, 5, 6, 7, 8]),
@@ -1063,13 +1061,13 @@ def test_cut() -> None:
10631061
intval_idx,
10641062
retbins=True,
10651063
)
1066-
check(assert_type(j0, pd.Series[Any, pd.Categorical]), pd.Series)
1064+
check(assert_type(j0, "pd.Series[Any, pd.Categorical]"), pd.Series)
10671065
check(assert_type(j1, npt.NDArray), np.ndarray)
1068-
check(assert_type(k0, pd.Series[Any, pd.Categorical]), pd.Series)
1066+
check(assert_type(k0, "pd.Series[Any, pd.Categorical]"), pd.Series)
10691067
check(assert_type(k1, npt.NDArray), np.ndarray)
1070-
check(assert_type(l0, pd.Series[Any, pd.Categorical]), pd.Series)
1068+
check(assert_type(l0, "pd.Series[Any, pd.Categorical]"), pd.Series)
10711069
check(assert_type(l1, npt.NDArray), np.ndarray)
1072-
check(assert_type(m0, pd.Series[Any, pd.Categorical]), pd.Series)
1070+
check(assert_type(m0, "pd.Series[Any, pd.Categorical]"), pd.Series)
10731071
check(assert_type(m1, pd.IntervalIndex), pd.IntervalIndex)
10741072

10751073
n0, n1 = pd.cut([1, 2, 3, 4, 5, 6, 7, 8], intval_idx, retbins=True)
@@ -1083,21 +1081,21 @@ def test_cut() -> None:
10831081
"pd.Series[Any, pd.Categorical]",
10841082
),
10851083
pd.Series,
1086-
pd.Interval[pd.Timestamp],
1084+
float,
10871085
)
10881086
check(
1089-
assert_type(pd.cut(s1, bins=10), pd.Series[Any, pd.Categorical]),
1087+
assert_type(pd.cut(s1, bins=10), "pd.Series[Any, pd.Categorical]"),
10901088
pd.Series,
10911089
pd.Interval,
10921090
)
10931091
s0r, s1r = pd.cut(s1, bins=10, retbins=True)
1094-
check(assert_type(s0r, pd.Series[Any, pd.Categorical]), pd.Series, pd.Interval)
1092+
check(assert_type(s0r, "pd.Series[Any, pd.Categorical]"), pd.Series, pd.Interval)
10951093
check(assert_type(s1r, pd.DatetimeIndex), pd.DatetimeIndex, pd.Timestamp)
10961094
s0rlf, s1rlf = pd.cut(s1, bins=10, labels=False, retbins=True)
1097-
check(assert_type(s0rlf, pd.Series[Any, pd.Categorical]), pd.Series, np.integer)
1095+
check(assert_type(s0rlf, "pd.Series[Any, pd.Categorical]"), pd.Series, np.integer)
10981096
check(assert_type(s1rlf, pd.DatetimeIndex), pd.DatetimeIndex, pd.Timestamp)
10991097
s0rls, s1rls = pd.cut(s1, bins=4, labels=["1", "2", "3", "4"], retbins=True)
1100-
check(assert_type(s0rls, pd.Series[Any, pd.Categorical]), pd.Series, str)
1098+
check(assert_type(s0rls, "pd.Series[Any, pd.Categorical]"), pd.Series, str)
11011099
check(assert_type(s1rls, pd.DatetimeIndex), pd.DatetimeIndex, pd.Timestamp)
11021100

11031101

0 commit comments

Comments
 (0)