Skip to content

Commit 6538f5e

Browse files
committed
Simplify test
1 parent d7f64de commit 6538f5e

File tree

2 files changed

+13
-51
lines changed

2 files changed

+13
-51
lines changed

pandas/core/groupby/generic.py

+1
Original file line numberDiff line numberDiff line change
@@ -1148,6 +1148,7 @@ def nunique(self, dropna=True):
11481148
val = self.obj._internal_get_values()
11491149

11501150
# GH 27951
1151+
# temporary fix while we wait for NumPy bug 12629 to be fixed
11511152
val[isna(val)] = np.datetime64("NaT")
11521153

11531154
try:

pandas/tests/groupby/test_function.py

+12-51
Original file line numberDiff line numberDiff line change
@@ -1026,77 +1026,38 @@ def test_nunique_with_timegrouper():
10261026

10271027

10281028
@pytest.mark.parametrize(
1029-
"data, dropna, expected",
1029+
"key, data, dropna, expected",
10301030
[
10311031
(
1032-
DataFrame(
1033-
{
1034-
"key": ["x", "x", "x", "x", "x"],
1035-
"data": [
1036-
Timestamp("2019-01-01 00:00:00"),
1037-
NaT,
1038-
Timestamp("2019-01-01 00:00:00"),
1039-
NaT,
1040-
Timestamp("2019-01-01 00:00:00"),
1041-
],
1042-
}
1043-
),
1032+
["x", "x", "x"],
1033+
[Timestamp("2019-01-01"), NaT, Timestamp("2019-01-01")],
10441034
True,
10451035
Series([1], index=pd.Index(["x"], name="key"), name="data"),
10461036
),
10471037
(
1048-
DataFrame(
1049-
{
1050-
"key": ["x", "x", "x", "x", "x"],
1051-
"data": [
1052-
dt.date(2019, 1, 1),
1053-
NaT,
1054-
dt.date(2019, 1, 1),
1055-
NaT,
1056-
dt.date(2019, 1, 1),
1057-
],
1058-
}
1059-
),
1038+
["x", "x", "x"],
1039+
[dt.date(2019, 1, 1), NaT, dt.date(2019, 1, 1)],
10601040
True,
10611041
Series([1], index=pd.Index(["x"], name="key"), name="data"),
10621042
),
10631043
(
1064-
DataFrame(
1065-
{
1066-
"key": ["x", "x", "x", "y", "y"],
1067-
"data": [
1068-
dt.date(2019, 1, 1),
1069-
NaT,
1070-
dt.date(2019, 1, 1),
1071-
NaT,
1072-
dt.date(2019, 1, 1),
1073-
],
1074-
}
1075-
),
1044+
["x", "x", "x", "y", "y"],
1045+
[dt.date(2019, 1, 1), NaT, dt.date(2019, 1, 1), NaT, dt.date(2019, 1, 1)],
10761046
False,
10771047
Series([2, 2], index=pd.Index(["x", "y"], name="key"), name="data"),
10781048
),
10791049
(
1080-
DataFrame(
1081-
{
1082-
"key": ["x", "x", "x", "x", "y"],
1083-
"data": [
1084-
dt.date(2019, 1, 1),
1085-
NaT,
1086-
dt.date(2019, 1, 1),
1087-
NaT,
1088-
dt.date(2019, 1, 1),
1089-
],
1090-
}
1091-
),
1050+
["x", "x", "x", "x", "y"],
1051+
[dt.date(2019, 1, 1), NaT, dt.date(2019, 1, 1), NaT, dt.date(2019, 1, 1)],
10921052
False,
10931053
Series([2, 1], index=pd.Index(["x", "y"], name="key"), name="data"),
10941054
),
10951055
],
10961056
)
1097-
def test_nunique_with_NaT(data, dropna, expected):
1057+
def test_nunique_with_NaT(key, data, dropna, expected):
10981058
# GH 27951
1099-
result = data.groupby(["key"])["data"].nunique(dropna=dropna)
1059+
df = pd.DataFrame({"key": key, "data": data})
1060+
result = df.groupby(["key"])["data"].nunique(dropna=dropna)
11001061
tm.assert_series_equal(result, expected)
11011062

11021063

0 commit comments

Comments
 (0)