From c0f3338468b9d2a30f7cfbcd29311d7df27ec6b9 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Wed, 11 Jan 2023 17:44:10 +0100 Subject: [PATCH 1/4] TEST: added test case for issue 41800 addresses #41800 --- pandas/tests/series/methods/test_combine_first.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandas/tests/series/methods/test_combine_first.py b/pandas/tests/series/methods/test_combine_first.py index 1d104b12ce7d2..f4f6dd00f2166 100644 --- a/pandas/tests/series/methods/test_combine_first.py +++ b/pandas/tests/series/methods/test_combine_first.py @@ -100,3 +100,11 @@ def test_combine_first_dt_tz_values(self, tz_naive_fixture): ) exp = Series(exp_vals, name="ser1") tm.assert_series_equal(exp, result) + + def test_combine_first_timezone_series_with_empty_series(self): + # GH 41800 + time_index = pd.date_range(datetime(2021, 1, 1, 1), datetime(2021, 1, 1, 10), freq='H', tz='Europe/Rome') + s1 = Series(np.random.random(10), index=time_index) + s2 = Series() + result = s1.combine_first(s2) + tm.assert_equal(result.values, s1.values) \ No newline at end of file From 00c2e6c0876ad344e169bf31196c67ff36b98c07 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Wed, 11 Jan 2023 17:52:02 +0100 Subject: [PATCH 2/4] fix lint error --- pandas/tests/series/methods/test_combine_first.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pandas/tests/series/methods/test_combine_first.py b/pandas/tests/series/methods/test_combine_first.py index f4f6dd00f2166..0453e6aa7168b 100644 --- a/pandas/tests/series/methods/test_combine_first.py +++ b/pandas/tests/series/methods/test_combine_first.py @@ -103,8 +103,13 @@ def test_combine_first_dt_tz_values(self, tz_naive_fixture): def test_combine_first_timezone_series_with_empty_series(self): # GH 41800 - time_index = pd.date_range(datetime(2021, 1, 1, 1), datetime(2021, 1, 1, 10), freq='H', tz='Europe/Rome') + time_index = pd.date_range( + datetime(2021, 1, 1, 1), + datetime(2021, 1, 1, 10), + freq='H', + tz='Europe/Rome' + ) s1 = Series(np.random.random(10), index=time_index) s2 = Series() result = s1.combine_first(s2) - tm.assert_equal(result.values, s1.values) \ No newline at end of file + tm.assert_equal(result.values, s1.values) From f5dab2c049b90afff1adfe6a67cf3922b2221375 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Wed, 11 Jan 2023 17:57:28 +0100 Subject: [PATCH 3/4] fix lint error --- pandas/tests/series/methods/test_combine_first.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/tests/series/methods/test_combine_first.py b/pandas/tests/series/methods/test_combine_first.py index 0453e6aa7168b..a14f99ef13b5b 100644 --- a/pandas/tests/series/methods/test_combine_first.py +++ b/pandas/tests/series/methods/test_combine_first.py @@ -104,10 +104,10 @@ def test_combine_first_dt_tz_values(self, tz_naive_fixture): def test_combine_first_timezone_series_with_empty_series(self): # GH 41800 time_index = pd.date_range( - datetime(2021, 1, 1, 1), - datetime(2021, 1, 1, 10), - freq='H', - tz='Europe/Rome' + datetime(2021, 1, 1, 1), + datetime(2021, 1, 1, 10), + freq="H", + tz="Europe/Rome" ) s1 = Series(np.random.random(10), index=time_index) s2 = Series() From c59cc684f689000e1b54d28b554030fcc77ded37 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Thu, 12 Jan 2023 09:54:56 +0100 Subject: [PATCH 4/4] added assert_series_equal control and changed date_range call --- pandas/tests/series/methods/test_combine_first.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/tests/series/methods/test_combine_first.py b/pandas/tests/series/methods/test_combine_first.py index a14f99ef13b5b..bd8f9df026e19 100644 --- a/pandas/tests/series/methods/test_combine_first.py +++ b/pandas/tests/series/methods/test_combine_first.py @@ -103,13 +103,13 @@ def test_combine_first_dt_tz_values(self, tz_naive_fixture): def test_combine_first_timezone_series_with_empty_series(self): # GH 41800 - time_index = pd.date_range( + time_index = date_range( datetime(2021, 1, 1, 1), datetime(2021, 1, 1, 10), freq="H", - tz="Europe/Rome" + tz="Europe/Rome", ) - s1 = Series(np.random.random(10), index=time_index) - s2 = Series() + s1 = Series(range(10), index=time_index) + s2 = Series(index=time_index) result = s1.combine_first(s2) - tm.assert_equal(result.values, s1.values) + tm.assert_series_equal(result, s1)