From 663806112edebbeb958e1f8b1ecd00b3f763450f Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Wed, 20 Jan 2021 09:12:15 +0700 Subject: [PATCH 01/10] pandas-dev issue #21881 --- pandas/tests/series/test_api.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index 2f255d92d86e3..af393bdbc26ab 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -167,3 +167,16 @@ def test_attrs(self): s.attrs["version"] = 1 result = s + 1 assert result.attrs == {"version": 1} + + def test_series_with_object_dtype(self): + # GH 21881 + timestamp = pd.Timestamp(1412526600000000000) + series = pd.Series([], dtype=object) + series['timestamp'] = timestamp + expected = type(series.timestamp) + + series = pd.Series([], dtype=object) + series['anything'] = 300.0 + series['timestamp'] = timestamp + result = type(series.timestamp) + assert result == expected From 27490b27564b84dc1428fc5e8c7903770a48dbfd Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Wed, 20 Jan 2021 09:23:27 +0700 Subject: [PATCH 02/10] pandas-dev issue #21881 --- pandas/tests/series/test_api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index af393bdbc26ab..c551fd8bb69ad 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -172,11 +172,11 @@ def test_series_with_object_dtype(self): # GH 21881 timestamp = pd.Timestamp(1412526600000000000) series = pd.Series([], dtype=object) - series['timestamp'] = timestamp + series["timestamp"] = timestamp expected = type(series.timestamp) series = pd.Series([], dtype=object) - series['anything'] = 300.0 - series['timestamp'] = timestamp + series["anything"] = 300.0 + series["timestamp"] = timestamp result = type(series.timestamp) assert result == expected From 0858626c8d424683586304029e0bf5160622bd90 Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Wed, 20 Jan 2021 09:34:00 +0700 Subject: [PATCH 03/10] pandas-dev issue #21881 --- pandas/tests/series/test_api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index c551fd8bb69ad..df8dc113793ff 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -174,7 +174,8 @@ def test_series_with_object_dtype(self): series = pd.Series([], dtype=object) series["timestamp"] = timestamp expected = type(series.timestamp) - + + series = pd.Series([], dtype=object) series["anything"] = 300.0 series["timestamp"] = timestamp From 6ebc64b6823e0dd06fadaff6d7c0c7b535f39579 Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Wed, 20 Jan 2021 09:44:12 +0700 Subject: [PATCH 04/10] pandas-dev issue #21881 --- pandas/tests/series/test_api.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index df8dc113793ff..93243dde3e6ae 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -174,8 +174,6 @@ def test_series_with_object_dtype(self): series = pd.Series([], dtype=object) series["timestamp"] = timestamp expected = type(series.timestamp) - - series = pd.Series([], dtype=object) series["anything"] = 300.0 series["timestamp"] = timestamp From 9f5650d75df8b6d1d500570965a66d15f17ada14 Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Thu, 21 Jan 2021 08:38:38 +0700 Subject: [PATCH 05/10] pandas-dev issue #21881 --- pandas/tests/series/indexing/test_setitem.py | 11 +++++++++++ pandas/tests/series/test_api.py | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pandas/tests/series/indexing/test_setitem.py b/pandas/tests/series/indexing/test_setitem.py index 7f469f361fec7..84a44b8f5a57c 100644 --- a/pandas/tests/series/indexing/test_setitem.py +++ b/pandas/tests/series/indexing/test_setitem.py @@ -367,6 +367,17 @@ def test_setitem_empty_series_datetimeindex_preserves_freq(self): tm.assert_series_equal(series, expected) assert series.index.freq == expected.index.freq + def test_series_with_object_dtype(self): + # GH 21881 + timestamp = Timestamp(1412526600000000000) + expected = Series([], dtype=object) + expected["timestamp"] = timestamp + + result = Series([], dtype=object) + result["anything"] = 300.0 + result["timestamp"] = timestamp + tm.assert_series_equal(result["timestamp"], expected["timestamp"]) + def test_setitem_scalar_into_readonly_backing_data(): # GH#14359: test that you cannot mutate a read only buffer diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index 93243dde3e6ae..2f255d92d86e3 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -167,15 +167,3 @@ def test_attrs(self): s.attrs["version"] = 1 result = s + 1 assert result.attrs == {"version": 1} - - def test_series_with_object_dtype(self): - # GH 21881 - timestamp = pd.Timestamp(1412526600000000000) - series = pd.Series([], dtype=object) - series["timestamp"] = timestamp - expected = type(series.timestamp) - series = pd.Series([], dtype=object) - series["anything"] = 300.0 - series["timestamp"] = timestamp - result = type(series.timestamp) - assert result == expected From 47294308b175335c01c50c5e9c23da0697e7b6e1 Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Thu, 21 Jan 2021 08:40:55 +0700 Subject: [PATCH 06/10] pandas-dev issue #21881 --- pandas/tests/series/indexing/test_setitem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/series/indexing/test_setitem.py b/pandas/tests/series/indexing/test_setitem.py index 84a44b8f5a57c..d19cfe7e62729 100644 --- a/pandas/tests/series/indexing/test_setitem.py +++ b/pandas/tests/series/indexing/test_setitem.py @@ -367,7 +367,7 @@ def test_setitem_empty_series_datetimeindex_preserves_freq(self): tm.assert_series_equal(series, expected) assert series.index.freq == expected.index.freq - def test_series_with_object_dtype(self): + def test_series_with_empty(self): # GH 21881 timestamp = Timestamp(1412526600000000000) expected = Series([], dtype=object) From 1093ebdf5ffd8b0fdb3479a19fbda2d689fe1cb4 Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Thu, 21 Jan 2021 09:27:36 +0700 Subject: [PATCH 07/10] pandas-dev issue #21881 --- pandas/tests/series/indexing/test_setitem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/series/indexing/test_setitem.py b/pandas/tests/series/indexing/test_setitem.py index d19cfe7e62729..51a681f5a66b0 100644 --- a/pandas/tests/series/indexing/test_setitem.py +++ b/pandas/tests/series/indexing/test_setitem.py @@ -367,7 +367,7 @@ def test_setitem_empty_series_datetimeindex_preserves_freq(self): tm.assert_series_equal(series, expected) assert series.index.freq == expected.index.freq - def test_series_with_empty(self): + def test_setitem_empty_series_timestamp_preserves_dtype(self): # GH 21881 timestamp = Timestamp(1412526600000000000) expected = Series([], dtype=object) From d2a0ed1b04d2f49dee32732dc4efd09e2a5f68fc Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Sat, 23 Jan 2021 07:20:18 +0700 Subject: [PATCH 08/10] pandas-dev issue #21881 --- pandas/tests/series/indexing/test_setitem.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/series/indexing/test_setitem.py b/pandas/tests/series/indexing/test_setitem.py index 51a681f5a66b0..13e366b73f6fb 100644 --- a/pandas/tests/series/indexing/test_setitem.py +++ b/pandas/tests/series/indexing/test_setitem.py @@ -370,8 +370,7 @@ def test_setitem_empty_series_datetimeindex_preserves_freq(self): def test_setitem_empty_series_timestamp_preserves_dtype(self): # GH 21881 timestamp = Timestamp(1412526600000000000) - expected = Series([], dtype=object) - expected["timestamp"] = timestamp + expected = Series([timestamp], index=["timestamp"], dtype=object) result = Series([], dtype=object) result["anything"] = 300.0 From 71712fa0ad289c7c3b3b6b54f10485c093808b10 Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Wed, 27 Jan 2021 06:57:54 +0700 Subject: [PATCH 09/10] pandas-dev issue #21881 --- pandas/tests/series/indexing/test_setitem.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pandas/tests/series/indexing/test_setitem.py b/pandas/tests/series/indexing/test_setitem.py index 13e366b73f6fb..40a97f87c2a58 100644 --- a/pandas/tests/series/indexing/test_setitem.py +++ b/pandas/tests/series/indexing/test_setitem.py @@ -370,12 +370,14 @@ def test_setitem_empty_series_datetimeindex_preserves_freq(self): def test_setitem_empty_series_timestamp_preserves_dtype(self): # GH 21881 timestamp = Timestamp(1412526600000000000) - expected = Series([timestamp], index=["timestamp"], dtype=object) - - result = Series([], dtype=object) - result["anything"] = 300.0 - result["timestamp"] = timestamp - tm.assert_series_equal(result["timestamp"], expected["timestamp"]) + series = Series([timestamp], index=["timestamp"], dtype=object) + expected = series["timestamp"] + + series = Series([], dtype=object) + series["anything"] = 300.0 + series["timestamp"] = timestamp + result = series["timestamp"] + assert isinstance(result, Timestamp) and isinstance(expected, Timestamp) def test_setitem_scalar_into_readonly_backing_data(): From 5533881948d09fdfac1163dfdca10fb4151b4bff Mon Sep 17 00:00:00 2001 From: ftrihardjo Date: Thu, 28 Jan 2021 16:45:15 +0700 Subject: [PATCH 10/10] pandas-dev issue #21881 --- pandas/tests/series/indexing/test_setitem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/series/indexing/test_setitem.py b/pandas/tests/series/indexing/test_setitem.py index 40a97f87c2a58..2dff35cdcd300 100644 --- a/pandas/tests/series/indexing/test_setitem.py +++ b/pandas/tests/series/indexing/test_setitem.py @@ -377,7 +377,7 @@ def test_setitem_empty_series_timestamp_preserves_dtype(self): series["anything"] = 300.0 series["timestamp"] = timestamp result = series["timestamp"] - assert isinstance(result, Timestamp) and isinstance(expected, Timestamp) + assert result == expected def test_setitem_scalar_into_readonly_backing_data():