From f259efbcd427af80cc7b43a929c8695e8468d069 Mon Sep 17 00:00:00 2001 From: phofl Date: Sat, 7 Nov 2020 23:59:08 +0100 Subject: [PATCH 1/2] CLN: Clean indexing tests --- pandas/tests/indexing/test_iloc.py | 1 - pandas/tests/indexing/test_indexing.py | 1 + pandas/tests/indexing/test_loc.py | 4 +++- pandas/tests/indexing/test_partial.py | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pandas/tests/indexing/test_iloc.py b/pandas/tests/indexing/test_iloc.py index 6c80354610a78..5bb7258329653 100644 --- a/pandas/tests/indexing/test_iloc.py +++ b/pandas/tests/indexing/test_iloc.py @@ -615,7 +615,6 @@ def test_iloc_mask(self): # UserWarnings from reindex of a boolean mask with catch_warnings(record=True): simplefilter("ignore", UserWarning) - result = dict() for idx in [None, "index", "locs"]: mask = (df.nums > 2).values if idx: diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index 614e424e8aca2..06bd8a5f300bb 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -843,6 +843,7 @@ def test_maybe_numeric_slice(self): result = maybe_numeric_slice(df, None, include_bool=True) expected = pd.IndexSlice[:, ["A", "C"]] + assert all(result[1] == expected[1]) result = maybe_numeric_slice(df, [1]) expected = [1] assert result == expected diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index 3b0fae537a6e5..d3aa536d3f682 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -1191,7 +1191,9 @@ def test_loc_setitem_multiindex_slice(self): def test_loc_getitem_slice_datetime_objs_with_datetimeindex(self): times = date_range("2000-01-01", freq="10min", periods=100000) ser = Series(range(100000), times) - ser.loc[datetime(1900, 1, 1) : datetime(2100, 1, 1)] + result = ser.loc[datetime(1900, 1, 1) : datetime(2100, 1, 1)] + expected = Series(range(100000), times) + tm.assert_series_equal(result, expected) class TestLocSetitemWithExpansion: diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index 01db937153b3a..3bf37f4cade8b 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -185,14 +185,14 @@ def test_series_partial_set(self): # loc equiv to .reindex expected = Series([np.nan, 0.2, np.nan], index=[3, 2, 3]) with pytest.raises(KeyError, match="with any missing labels"): - result = ser.loc[[3, 2, 3]] + ser.loc[[3, 2, 3]] result = ser.reindex([3, 2, 3]) tm.assert_series_equal(result, expected, check_index_type=True) expected = Series([np.nan, 0.2, np.nan, np.nan], index=[3, 2, 3, "x"]) with pytest.raises(KeyError, match="with any missing labels"): - result = ser.loc[[3, 2, 3, "x"]] + ser.loc[[3, 2, 3, "x"]] result = ser.reindex([3, 2, 3, "x"]) tm.assert_series_equal(result, expected, check_index_type=True) @@ -203,7 +203,7 @@ def test_series_partial_set(self): expected = Series([0.2, 0.2, np.nan, 0.1], index=[2, 2, "x", 1]) with pytest.raises(KeyError, match="with any missing labels"): - result = ser.loc[[2, 2, "x", 1]] + ser.loc[[2, 2, "x", 1]] result = ser.reindex([2, 2, "x", 1]) tm.assert_series_equal(result, expected, check_index_type=True) From 9e9ab5d608a3a0a66f964faa7d411d5e009f640a Mon Sep 17 00:00:00 2001 From: phofl Date: Sun, 8 Nov 2020 00:48:53 +0100 Subject: [PATCH 2/2] Change expected --- pandas/tests/indexing/test_loc.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index d3aa536d3f682..47ab80696494e 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -1192,8 +1192,7 @@ def test_loc_getitem_slice_datetime_objs_with_datetimeindex(self): times = date_range("2000-01-01", freq="10min", periods=100000) ser = Series(range(100000), times) result = ser.loc[datetime(1900, 1, 1) : datetime(2100, 1, 1)] - expected = Series(range(100000), times) - tm.assert_series_equal(result, expected) + tm.assert_series_equal(result, ser) class TestLocSetitemWithExpansion: