From 42cf884c1c5d25c5b376108092ba498d13af513c Mon Sep 17 00:00:00 2001 From: Matsuoka Kota Date: Sat, 2 May 2020 17:11:57 +0900 Subject: [PATCH 1/3] TST: add pattern for nearest() --- pandas/tests/resample/test_datetime_index.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pandas/tests/resample/test_datetime_index.py b/pandas/tests/resample/test_datetime_index.py index f15d39e9e6456..ad56963eab4b7 100644 --- a/pandas/tests/resample/test_datetime_index.py +++ b/pandas/tests/resample/test_datetime_index.py @@ -535,11 +535,13 @@ def test_upsample_with_limit(): tm.assert_series_equal(result, expected) -def test_nearest_upsample_with_limit(): - rng = date_range("1/1/2000", periods=3, freq="5t") +@pytest.mark.parametrize("freq", ["Y", "10M", "5D", "10H", "5Min", "10S"]) +@pytest.mark.parametrize("rule", ["Y", "3M", "15D", "30H", "15Min", "30S"]) +def test_nearest_upsample_with_limit(freq, rule): + rng = date_range("1/1/2000", periods=3, freq=freq) ts = Series(np.random.randn(len(rng)), rng) - result = ts.resample("t").nearest(limit=2) + result = ts.resample(rule).nearest(limit=2) expected = ts.reindex(result.index, method="nearest", limit=2) tm.assert_series_equal(result, expected) From e9be06bf916eb62c2e9746019e602e0adfef37b5 Mon Sep 17 00:00:00 2001 From: Matsuoka Kota Date: Sun, 3 May 2020 11:14:06 +0900 Subject: [PATCH 2/3] Add tz_aware_fixture in test_nearest_upsample_with_limit --- pandas/tests/resample/test_datetime_index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/resample/test_datetime_index.py b/pandas/tests/resample/test_datetime_index.py index ad56963eab4b7..a34098c7e1c15 100644 --- a/pandas/tests/resample/test_datetime_index.py +++ b/pandas/tests/resample/test_datetime_index.py @@ -537,8 +537,8 @@ def test_upsample_with_limit(): @pytest.mark.parametrize("freq", ["Y", "10M", "5D", "10H", "5Min", "10S"]) @pytest.mark.parametrize("rule", ["Y", "3M", "15D", "30H", "15Min", "30S"]) -def test_nearest_upsample_with_limit(freq, rule): - rng = date_range("1/1/2000", periods=3, freq=freq) +def test_nearest_upsample_with_limit(tz_aware_fixture, freq, rule): + rng = date_range("1/1/2000", periods=3, freq=freq, tz=tz_aware_fixture) ts = Series(np.random.randn(len(rng)), rng) result = ts.resample(rule).nearest(limit=2) From a357330cec103a944bb145334f96b3a10cbd0898 Mon Sep 17 00:00:00 2001 From: Matsuoka Kota Date: Mon, 4 May 2020 07:03:18 +0900 Subject: [PATCH 3/3] Add GH issue number --- pandas/tests/resample/test_datetime_index.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/resample/test_datetime_index.py b/pandas/tests/resample/test_datetime_index.py index a34098c7e1c15..4be48a4d060a8 100644 --- a/pandas/tests/resample/test_datetime_index.py +++ b/pandas/tests/resample/test_datetime_index.py @@ -538,6 +538,7 @@ def test_upsample_with_limit(): @pytest.mark.parametrize("freq", ["Y", "10M", "5D", "10H", "5Min", "10S"]) @pytest.mark.parametrize("rule", ["Y", "3M", "15D", "30H", "15Min", "30S"]) def test_nearest_upsample_with_limit(tz_aware_fixture, freq, rule): + # GH 33939 rng = date_range("1/1/2000", periods=3, freq=freq, tz=tz_aware_fixture) ts = Series(np.random.randn(len(rng)), rng)