Skip to content

Commit 75d28f1

Browse files
committed
Merge branch 'groupby_apply_future_warning' of https://github.com/rhshadrach/pandas into groupby_apply_future_warning
2 parents 9863ca9 + 23c455e commit 75d28f1

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

pandas/tests/resample/test_resampler_grouper.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas._config import using_string_dtype
7-
86
from pandas.compat import is_platform_windows
97

108
import pandas as pd
@@ -494,7 +492,6 @@ def test_empty(keys):
494492
tm.assert_frame_equal(result, expected)
495493

496494

497-
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
498495
@pytest.mark.parametrize("consolidate", [True, False])
499496
def test_resample_groupby_agg_object_dtype_all_nan(consolidate):
500497
# https://github.com/pandas-dev/pandas/issues/39329

0 commit comments

Comments
 (0)