From f96bbb5b885eeaa8bed106534d89c27f7609410a Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 21 Feb 2020 14:31:17 +0000 Subject: [PATCH 1/2] TST: add test for get_loc on tz-aware DatetimeIndex --- pandas/tests/indexes/datetimes/test_indexing.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pandas/tests/indexes/datetimes/test_indexing.py b/pandas/tests/indexes/datetimes/test_indexing.py index c358e72538788..f01b732cbeb31 100644 --- a/pandas/tests/indexes/datetimes/test_indexing.py +++ b/pandas/tests/indexes/datetimes/test_indexing.py @@ -452,6 +452,17 @@ def test_get_loc_reasonable_key_error(self): with pytest.raises(KeyError, match="2000"): index.get_loc("1/1/2000") + def test_get_loc_tz_aware(self): + # https://github.com/pandas-dev/pandas/issues/32140 + dti = pd.date_range( + pd.Timestamp("2019-12-12 00:00:00", tz="US/Eastern"), + pd.Timestamp("2019-12-13 00:00:00", tz="US/Eastern"), + freq="5s", + ) + key = pd.Timestamp("2019-12-12 10:19:25", tz="US/Eastern") + result = dti.get_loc(key, method="nearest") + assert result == 7433 + class TestDatetimeIndex: @pytest.mark.parametrize( From 8079ed70654e0b466c9eb4bc302cc5bc917b01b8 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 21 Feb 2020 16:43:29 +0000 Subject: [PATCH 2/2] move test --- .../tests/indexes/datetimes/test_indexing.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pandas/tests/indexes/datetimes/test_indexing.py b/pandas/tests/indexes/datetimes/test_indexing.py index f01b732cbeb31..ceab670fb5041 100644 --- a/pandas/tests/indexes/datetimes/test_indexing.py +++ b/pandas/tests/indexes/datetimes/test_indexing.py @@ -423,6 +423,17 @@ def test_get_loc(self): with pytest.raises(NotImplementedError): idx.get_loc(time(12, 30), method="pad") + def test_get_loc_tz_aware(self): + # https://github.com/pandas-dev/pandas/issues/32140 + dti = pd.date_range( + pd.Timestamp("2019-12-12 00:00:00", tz="US/Eastern"), + pd.Timestamp("2019-12-13 00:00:00", tz="US/Eastern"), + freq="5s", + ) + key = pd.Timestamp("2019-12-12 10:19:25", tz="US/Eastern") + result = dti.get_loc(key, method="nearest") + assert result == 7433 + def test_get_loc_nat(self): # GH#20464 index = DatetimeIndex(["1/3/2000", "NaT"]) @@ -452,17 +463,6 @@ def test_get_loc_reasonable_key_error(self): with pytest.raises(KeyError, match="2000"): index.get_loc("1/1/2000") - def test_get_loc_tz_aware(self): - # https://github.com/pandas-dev/pandas/issues/32140 - dti = pd.date_range( - pd.Timestamp("2019-12-12 00:00:00", tz="US/Eastern"), - pd.Timestamp("2019-12-13 00:00:00", tz="US/Eastern"), - freq="5s", - ) - key = pd.Timestamp("2019-12-12 10:19:25", tz="US/Eastern") - result = dti.get_loc(key, method="nearest") - assert result == 7433 - class TestDatetimeIndex: @pytest.mark.parametrize(