From 15977faac2bd66b8690d1857e4b4a1668021bd94 Mon Sep 17 00:00:00 2001 From: Ketan Arlulkar <6256964+ketanarlulkar@users.noreply.github.com> Date: Sun, 21 Jun 2020 09:12:35 +0530 Subject: [PATCH 1/5] Added unit test for bug mentioned in issue-34860. Te bug is already fixed on master --- pandas/tests/series/indexing/test_datetime.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 0b34fab7b80b1..a067c194db2f1 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -667,3 +667,17 @@ def test_setitem_tuple_with_datetimetz(): result[(0, 1)] = np.nan expected.iloc[0] = np.nan tm.assert_series_equal(result, expected) + + +""" +BUG: indexing regression with datetime index +""" + + +def test_indexing_regression(): + arr = date_range('1/1/2008', '1/2/2008') + ser = arr.to_series()['2008'] + assert type(ser) == Series + assert type(ser[0]) == Timestamp + assert type(ser.index[0]) == Timestamp + From 36f69558d422f9c45c34e2b74c7ff5768ddc72d0 Mon Sep 17 00:00:00 2001 From: Ketan Arlulkar <6256964+ketanarlulkar@users.noreply.github.com> Date: Sun, 21 Jun 2020 09:23:54 +0530 Subject: [PATCH 2/5] Executed black pandas & git diff upstream/master -u -- "*.py" | flake8 --diff --- pandas/tests/series/indexing/test_datetime.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index a067c194db2f1..0146a6c55a812 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -675,9 +675,8 @@ def test_setitem_tuple_with_datetimetz(): def test_indexing_regression(): - arr = date_range('1/1/2008', '1/2/2008') - ser = arr.to_series()['2008'] + arr = date_range("1/1/2008", "1/2/2008") + ser = arr.to_series()["2008"] assert type(ser) == Series assert type(ser[0]) == Timestamp assert type(ser.index[0]) == Timestamp - From 85d5912fe6e63c134d7c58956ef8e13655873355 Mon Sep 17 00:00:00 2001 From: Ketan Arlulkar <6256964+ketanarlulkar@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:18:46 +0530 Subject: [PATCH 3/5] Asserting index and series --- pandas/tests/series/indexing/test_datetime.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 0146a6c55a812..86a2d71a1f736 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -669,14 +669,13 @@ def test_setitem_tuple_with_datetimetz(): tm.assert_series_equal(result, expected) -""" -BUG: indexing regression with datetime index -""" - - def test_indexing_regression(): - arr = date_range("1/1/2008", "1/2/2008") + # Issue 34860 + arr = date_range("1/1/2008", "1/1/2009") ser = arr.to_series()["2008"] - assert type(ser) == Series - assert type(ser[0]) == Timestamp - assert type(ser.index[0]) == Timestamp + + rng = date_range(start="2008-01-01", end="2008-12-31") + expected = Series(rng, index=rng) + + tm.assert_series_equal(ser, expected) + tm.assert_index_equal(ser.index, expected.index) From 580c27f87f166a393467564855aac7f7fc7c3bfa Mon Sep 17 00:00:00 2001 From: Ketan Arlulkar <6256964+ketanarlulkar@users.noreply.github.com> Date: Tue, 23 Jun 2020 07:30:13 +0530 Subject: [PATCH 4/5] Removed index assert as it is duplicated by series assert --- pandas/tests/series/indexing/test_datetime.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 86a2d71a1f736..836da68863cb7 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -678,4 +678,3 @@ def test_indexing_regression(): expected = Series(rng, index=rng) tm.assert_series_equal(ser, expected) - tm.assert_index_equal(ser.index, expected.index) From fa266e09b00620fbe392194044a4f36d6349ce98 Mon Sep 17 00:00:00 2001 From: Ketan Arlulkar <6256964+ketanarlulkar@users.noreply.github.com> Date: Wed, 24 Jun 2020 12:01:19 +0530 Subject: [PATCH 5/5] Moved test to test_partial.py --- pandas/tests/indexing/test_partial.py | 10 ++++++++++ pandas/tests/series/indexing/test_datetime.py | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index 513ca039366cb..350f86b4e9fd0 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -650,3 +650,13 @@ def test_loc_with_list_of_strings_representing_datetimes_not_matched_type( s[labels] with pytest.raises(KeyError, match=msg): df.loc[labels] + + def test_indexing_timeseries_regression(self): + # Issue 34860 + arr = date_range("1/1/2008", "1/1/2009") + result = arr.to_series()["2008"] + + rng = date_range(start="2008-01-01", end="2008-12-31") + expected = Series(rng, index=rng) + + tm.assert_series_equal(result, expected) diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 836da68863cb7..0b34fab7b80b1 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -667,14 +667,3 @@ def test_setitem_tuple_with_datetimetz(): result[(0, 1)] = np.nan expected.iloc[0] = np.nan tm.assert_series_equal(result, expected) - - -def test_indexing_regression(): - # Issue 34860 - arr = date_range("1/1/2008", "1/1/2009") - ser = arr.to_series()["2008"] - - rng = date_range(start="2008-01-01", end="2008-12-31") - expected = Series(rng, index=rng) - - tm.assert_series_equal(ser, expected)