From d9a150c5b6fe3291c8f16f99c5b7d8f756d2b446 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:06:27 +0200 Subject: [PATCH 01/20] add params pytest fixture --- pandas/conftest.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandas/conftest.py b/pandas/conftest.py index b2870f8fd9ece..95cd561b5fe0b 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -501,6 +501,12 @@ def mock(): return pytest.importorskip("mock") +@pytest.fixture(params=[True, False]) +def box(request): + """Whether to box the data in a Series""" + return request.param + + # ---------------------------------------------------------------- # Global setup for tests using Hypothesis From ddce1fe4a3a5895aabf38481292ec36198c1a3e2 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:07:16 +0200 Subject: [PATCH 02/20] add box to be able to directly test setitem --- pandas/tests/extension/base/setitem.py | 54 ++++++++++++++------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 307543eca2b3e..eab5f1fba77e8 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -9,18 +9,20 @@ class BaseSetitemTests(BaseExtensionTests): - def test_setitem_scalar_series(self, data): - arr = pd.Series(data) - arr[0] = data[1] - assert arr[0] == data[1] - - def test_setitem_sequence(self, data): - arr = pd.Series(data) + def test_setitem_scalar_series(self, data, box): + if box: + data = pd.Series(data) + data[0] = data[1] + assert data[0] == data[1] + + def test_setitem_sequence(self, data, box): + if box: + data = pd.Series(data) original = data.copy() - arr[[0, 1]] = [data[1], data[0]] - assert arr[0] == original[1] - assert arr[1] == original[0] + data[[0, 1]] = [data[1], data[0]] + assert data[0] == original[1] + assert data[1] == original[0] @pytest.mark.parametrize('as_array', [True, False]) def test_setitem_sequence_mismatched_length_raises(self, data, as_array): @@ -36,25 +38,27 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value - def test_setitem_empty_indxer(self, data): - ser = pd.Series(data) - original = ser.copy() - ser[[]] = [] - self.assert_series_equal(ser, original) - - def test_setitem_sequence_broadcasts(self, data): - arr = pd.Series(data) + def test_setitem_empty_indxer(self, data, box): + if box: + data = pd.Series(data) + original = data.copy() + data[[]] = [] + self.assert_series_equal(data, original) - arr[[0, 1]] = data[2] - assert arr[0] == data[2] - assert arr[1] == data[2] + def test_setitem_sequence_broadcasts(self, data, box): + if box: + data = pd.Series(data) + data[[0, 1]] = data[2] + assert data[0] == data[2] + assert data[1] == data[2] @pytest.mark.parametrize('setter', ['loc', 'iloc']) - def test_setitem_scalar(self, data, setter): - arr = pd.Series(data) - setter = getattr(arr, setter) + def test_setitem_scalar(self, data, box, setter): + if box: + data = pd.Series(data) + setter = getattr(data, setter) operator.setitem(setter, 0, data[1]) - assert arr[0] == data[1] + assert data[0] == data[1] def test_setitem_loc_scalar_mixed(self, data): df = pd.DataFrame({"A": np.arange(len(data)), "B": data}) From 84800f8d7eda556c45dfd8aecd948af1e08477c7 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:25:56 +0200 Subject: [PATCH 03/20] remove box in test_setitem_scalar function --- pandas/tests/extension/base/setitem.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index eab5f1fba77e8..ec98042f335d8 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -53,12 +53,11 @@ def test_setitem_sequence_broadcasts(self, data, box): assert data[1] == data[2] @pytest.mark.parametrize('setter', ['loc', 'iloc']) - def test_setitem_scalar(self, data, box, setter): - if box: - data = pd.Series(data) - setter = getattr(data, setter) + def test_setitem_scalar(self, data, setter): + arr = pd.Series(data) + setter = getattr(arr, setter) operator.setitem(setter, 0, data[1]) - assert data[0] == data[1] + assert arr[0] == data[1] def test_setitem_loc_scalar_mixed(self, data): df = pd.DataFrame({"A": np.arange(len(data)), "B": data}) From 935064133f7fda3069efc8e6a8accb8564f75d10 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:36:31 +0200 Subject: [PATCH 04/20] add two asserts --- pandas/tests/extension/base/setitem.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index ec98042f335d8..b8edb6c14f73e 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -34,9 +34,11 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): xpr = 'cannot set using a {} indexer with a different length' with tm.assert_raises_regex(ValueError, xpr.format('list-like')): ser[[0, 1]] = value + assert ser[[0, 1]] == value with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value + assert ser[slice(3)] == value def test_setitem_empty_indxer(self, data, box): if box: From f12ffd2f80209babb0a50f986a8df403e8fa189d Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 11:53:58 +0200 Subject: [PATCH 05/20] rename fixture --- pandas/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 95cd561b5fe0b..48945b6186336 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -502,7 +502,7 @@ def mock(): @pytest.fixture(params=[True, False]) -def box(request): +def box_in_series(request): """Whether to box the data in a Series""" return request.param From d50715bdb1d9d4d3f4537841492439c33a651c54 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 11:54:21 +0200 Subject: [PATCH 06/20] rename box with box_in_series --- pandas/tests/extension/base/setitem.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index b8edb6c14f73e..a712da7878837 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -9,14 +9,14 @@ class BaseSetitemTests(BaseExtensionTests): - def test_setitem_scalar_series(self, data, box): - if box: + def test_setitem_scalar_series(self, data, box_in_series): + if box_in_series: data = pd.Series(data) data[0] = data[1] assert data[0] == data[1] - def test_setitem_sequence(self, data, box): - if box: + def test_setitem_sequence(self, data, box_in_series): + if box_in_series: data = pd.Series(data) original = data.copy() @@ -40,15 +40,15 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): ser[slice(3)] = value assert ser[slice(3)] == value - def test_setitem_empty_indxer(self, data, box): - if box: + def test_setitem_empty_indxer(self, data, box_in_series): + if box_in_series: data = pd.Series(data) original = data.copy() data[[]] = [] self.assert_series_equal(data, original) - def test_setitem_sequence_broadcasts(self, data, box): - if box: + def test_setitem_sequence_broadcasts(self, data, box_in_series): + if box_in_series: data = pd.Series(data) data[[0, 1]] = data[2] assert data[0] == data[2] From 8a9f494d37b31298f4409c4f6002fff5de87efe7 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:06:27 +0200 Subject: [PATCH 07/20] add params pytest fixture --- pandas/conftest.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandas/conftest.py b/pandas/conftest.py index b2870f8fd9ece..95cd561b5fe0b 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -501,6 +501,12 @@ def mock(): return pytest.importorskip("mock") +@pytest.fixture(params=[True, False]) +def box(request): + """Whether to box the data in a Series""" + return request.param + + # ---------------------------------------------------------------- # Global setup for tests using Hypothesis From c2e5895487e356ff4c283d1c31d6abc26b9d5662 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:07:16 +0200 Subject: [PATCH 08/20] add box to be able to directly test setitem --- pandas/tests/extension/base/setitem.py | 54 ++++++++++++++------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 307543eca2b3e..eab5f1fba77e8 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -9,18 +9,20 @@ class BaseSetitemTests(BaseExtensionTests): - def test_setitem_scalar_series(self, data): - arr = pd.Series(data) - arr[0] = data[1] - assert arr[0] == data[1] - - def test_setitem_sequence(self, data): - arr = pd.Series(data) + def test_setitem_scalar_series(self, data, box): + if box: + data = pd.Series(data) + data[0] = data[1] + assert data[0] == data[1] + + def test_setitem_sequence(self, data, box): + if box: + data = pd.Series(data) original = data.copy() - arr[[0, 1]] = [data[1], data[0]] - assert arr[0] == original[1] - assert arr[1] == original[0] + data[[0, 1]] = [data[1], data[0]] + assert data[0] == original[1] + assert data[1] == original[0] @pytest.mark.parametrize('as_array', [True, False]) def test_setitem_sequence_mismatched_length_raises(self, data, as_array): @@ -36,25 +38,27 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value - def test_setitem_empty_indxer(self, data): - ser = pd.Series(data) - original = ser.copy() - ser[[]] = [] - self.assert_series_equal(ser, original) - - def test_setitem_sequence_broadcasts(self, data): - arr = pd.Series(data) + def test_setitem_empty_indxer(self, data, box): + if box: + data = pd.Series(data) + original = data.copy() + data[[]] = [] + self.assert_series_equal(data, original) - arr[[0, 1]] = data[2] - assert arr[0] == data[2] - assert arr[1] == data[2] + def test_setitem_sequence_broadcasts(self, data, box): + if box: + data = pd.Series(data) + data[[0, 1]] = data[2] + assert data[0] == data[2] + assert data[1] == data[2] @pytest.mark.parametrize('setter', ['loc', 'iloc']) - def test_setitem_scalar(self, data, setter): - arr = pd.Series(data) - setter = getattr(arr, setter) + def test_setitem_scalar(self, data, box, setter): + if box: + data = pd.Series(data) + setter = getattr(data, setter) operator.setitem(setter, 0, data[1]) - assert arr[0] == data[1] + assert data[0] == data[1] def test_setitem_loc_scalar_mixed(self, data): df = pd.DataFrame({"A": np.arange(len(data)), "B": data}) From 9bd19197ac30846bf812aa13872075eacc69d9b9 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:25:56 +0200 Subject: [PATCH 09/20] remove box in test_setitem_scalar function --- pandas/tests/extension/base/setitem.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index eab5f1fba77e8..ec98042f335d8 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -53,12 +53,11 @@ def test_setitem_sequence_broadcasts(self, data, box): assert data[1] == data[2] @pytest.mark.parametrize('setter', ['loc', 'iloc']) - def test_setitem_scalar(self, data, box, setter): - if box: - data = pd.Series(data) - setter = getattr(data, setter) + def test_setitem_scalar(self, data, setter): + arr = pd.Series(data) + setter = getattr(arr, setter) operator.setitem(setter, 0, data[1]) - assert data[0] == data[1] + assert arr[0] == data[1] def test_setitem_loc_scalar_mixed(self, data): df = pd.DataFrame({"A": np.arange(len(data)), "B": data}) From f4854d8a0a3a290e18312e9e167d21405ad584f7 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Tue, 23 Oct 2018 21:36:31 +0200 Subject: [PATCH 10/20] add two asserts --- pandas/tests/extension/base/setitem.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index ec98042f335d8..b8edb6c14f73e 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -34,9 +34,11 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): xpr = 'cannot set using a {} indexer with a different length' with tm.assert_raises_regex(ValueError, xpr.format('list-like')): ser[[0, 1]] = value + assert ser[[0, 1]] == value with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value + assert ser[slice(3)] == value def test_setitem_empty_indxer(self, data, box): if box: From e544d5e340a2c5fbbe7256fc934cad4c8bb0a408 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 11:53:58 +0200 Subject: [PATCH 11/20] rename fixture --- pandas/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 95cd561b5fe0b..48945b6186336 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -502,7 +502,7 @@ def mock(): @pytest.fixture(params=[True, False]) -def box(request): +def box_in_series(request): """Whether to box the data in a Series""" return request.param From d2232903a0542cbd34df429849ed2db02ef0f2c9 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 11:54:21 +0200 Subject: [PATCH 12/20] rename box with box_in_series --- pandas/tests/extension/base/setitem.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index b8edb6c14f73e..a712da7878837 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -9,14 +9,14 @@ class BaseSetitemTests(BaseExtensionTests): - def test_setitem_scalar_series(self, data, box): - if box: + def test_setitem_scalar_series(self, data, box_in_series): + if box_in_series: data = pd.Series(data) data[0] = data[1] assert data[0] == data[1] - def test_setitem_sequence(self, data, box): - if box: + def test_setitem_sequence(self, data, box_in_series): + if box_in_series: data = pd.Series(data) original = data.copy() @@ -40,15 +40,15 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): ser[slice(3)] = value assert ser[slice(3)] == value - def test_setitem_empty_indxer(self, data, box): - if box: + def test_setitem_empty_indxer(self, data, box_in_series): + if box_in_series: data = pd.Series(data) original = data.copy() data[[]] = [] self.assert_series_equal(data, original) - def test_setitem_sequence_broadcasts(self, data, box): - if box: + def test_setitem_sequence_broadcasts(self, data, box_in_series): + if box_in_series: data = pd.Series(data) data[[0, 1]] = data[2] assert data[0] == data[2] From d92988c214d506e649f1ccbbb925c817ca4ebd36 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 13:24:25 +0200 Subject: [PATCH 13/20] add ._values for ser --- pandas/tests/extension/base/setitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index a712da7878837..b7c1d1585106f 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -34,11 +34,11 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): xpr = 'cannot set using a {} indexer with a different length' with tm.assert_raises_regex(ValueError, xpr.format('list-like')): ser[[0, 1]] = value - assert ser[[0, 1]] == value + assert ser._values[[0, 1]] == value with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value - assert ser[slice(3)] == value + assert ser._values[slice(3)] == value def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: From fca3b549eec4a050f64a54eb9c75b7b31810751d Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 14:46:01 +0200 Subject: [PATCH 14/20] debug series type error --- pandas/tests/extension/base/setitem.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index b7c1d1585106f..e652f7e66d18e 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -43,9 +43,9 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: data = pd.Series(data) - original = data.copy() - data[[]] = [] - self.assert_series_equal(data, original) + original = data.copy() + data[[]] = [] + self.assert_series_equal(data, original) def test_setitem_sequence_broadcasts(self, data, box_in_series): if box_in_series: From 10cca66b82691906fcf82e33c45578db8428f404 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 14:51:33 +0200 Subject: [PATCH 15/20] debug assert error --- pandas/tests/extension/base/setitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index e652f7e66d18e..0b65a2066d5f8 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -34,11 +34,11 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): xpr = 'cannot set using a {} indexer with a different length' with tm.assert_raises_regex(ValueError, xpr.format('list-like')): ser[[0, 1]] = value - assert ser._values[[0, 1]] == value + assert ser[[0, 1]] == value with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value - assert ser._values[slice(3)] == value + assert ser[slice(3)] == value def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: From 39df34ef7753030185c0e8f05b9979e57dc5da47 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 14:53:09 +0200 Subject: [PATCH 16/20] debug assert error --- pandas/tests/extension/base/setitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 0b65a2066d5f8..e652f7e66d18e 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -34,11 +34,11 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): xpr = 'cannot set using a {} indexer with a different length' with tm.assert_raises_regex(ValueError, xpr.format('list-like')): ser[[0, 1]] = value - assert ser[[0, 1]] == value + assert ser._values[[0, 1]] == value with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value - assert ser[slice(3)] == value + assert ser._values[slice(3)] == value def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: From 97261988cd99552b2ec0202540997a8ceafffce2 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Wed, 24 Oct 2018 14:58:22 +0200 Subject: [PATCH 17/20] move fixture from conftest to extension/conftest --- pandas/conftest.py | 6 ------ pandas/tests/extension/conftest.py | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 48945b6186336..b2870f8fd9ece 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -501,12 +501,6 @@ def mock(): return pytest.importorskip("mock") -@pytest.fixture(params=[True, False]) -def box_in_series(request): - """Whether to box the data in a Series""" - return request.param - - # ---------------------------------------------------------------- # Global setup for tests using Hypothesis diff --git a/pandas/tests/extension/conftest.py b/pandas/tests/extension/conftest.py index 8e397d228a5b6..7758bd01840ae 100644 --- a/pandas/tests/extension/conftest.py +++ b/pandas/tests/extension/conftest.py @@ -98,3 +98,9 @@ def data_for_grouping(): Where A < B < C and NA is missing """ raise NotImplementedError + + +@pytest.fixture(params=[True, False]) +def box_in_series(request): + """Whether to box the data in a Series""" + return request.param From 462fd3eaf5f68f655cb035e1e6d02fe3c9c6bfe4 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 25 Oct 2018 16:50:54 +0200 Subject: [PATCH 18/20] modify identation and add two asserts --- pandas/tests/extension/base/setitem.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index e652f7e66d18e..3026077d2bb6a 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -43,9 +43,9 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: data = pd.Series(data) - original = data.copy() - data[[]] = [] - self.assert_series_equal(data, original) + original = data.copy() + data[[]] = [] + self.assert_equal(data, original) def test_setitem_sequence_broadcasts(self, data, box_in_series): if box_in_series: From 06197526dfec0d6c8c0b89c39072dde62fffa8f0 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 25 Oct 2018 16:52:39 +0200 Subject: [PATCH 19/20] add two asserts --- pandas/tests/extension/base/setitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 3026077d2bb6a..5736e78ff5f0b 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -34,11 +34,11 @@ def test_setitem_sequence_mismatched_length_raises(self, data, as_array): xpr = 'cannot set using a {} indexer with a different length' with tm.assert_raises_regex(ValueError, xpr.format('list-like')): ser[[0, 1]] = value - assert ser._values[[0, 1]] == value + assert ser._values[[0, 1]] == value with tm.assert_raises_regex(ValueError, xpr.format('slice')): ser[slice(3)] = value - assert ser._values[slice(3)] == value + assert ser._values[slice(3)] == value def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: From 009440d1d715c1c1af24852acee3a2161157643f Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 25 Oct 2018 23:41:28 +0200 Subject: [PATCH 20/20] fix empty list error --- pandas/tests/extension/base/setitem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 5736e78ff5f0b..6ebe3cb7487ab 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -44,7 +44,7 @@ def test_setitem_empty_indxer(self, data, box_in_series): if box_in_series: data = pd.Series(data) original = data.copy() - data[[]] = [] + data[np.array([], dtype=int)] = [] self.assert_equal(data, original) def test_setitem_sequence_broadcasts(self, data, box_in_series):