From a4d6ae4812bfa368e8999aada023ee6cfd7c9a03 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 15:41:14 +0100 Subject: [PATCH 01/15] Update test_period_range.py Attempting to implement test for resolved issue #21793 --- pandas/tests/indexes/period/test_period_range.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 2c3d22198df9f..42c42c085fda3 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -51,6 +51,9 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) + result = period_range(start=start, end=end, freq="Q", name="foo") + tm.assert_equal(result ,result.values) + # empty expected = PeriodIndex([], freq="W", name="foo") From 64de146ccc6270cfcd1693359290b3320f785b1f Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 15:51:04 +0100 Subject: [PATCH 02/15] Update test_period_range.py Fixing PEP formatting --- pandas/tests/indexes/period/test_period_range.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 42c42c085fda3..2d997bd7359b2 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -50,13 +50,13 @@ def test_construction_from_period(self): ).to_period() result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) - + result = period_range(start=start, end=end, freq="Q", name="foo") - tm.assert_equal(result ,result.values) + tm.assert_equal(result, result.values) # empty expected = PeriodIndex([], freq="W", name="foo") - + result = period_range(start=start, periods=0, freq="W", name="foo") tm.assert_index_equal(result, expected) From 80e7f263147fc11c6a6d5674307d26ff04cf37c2 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 16:14:37 +0100 Subject: [PATCH 03/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 2d997bd7359b2..9fb44343f91bc 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -51,7 +51,7 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) - result = period_range(start=start, end=end, freq="Q", name="foo") + result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_equal(result, result.values) # empty From d4ac552cf1f5f56a4d3577582da303755b424a70 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 16:49:14 +0100 Subject: [PATCH 04/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 9fb44343f91bc..ce1c439b04986 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -50,13 +50,13 @@ def test_construction_from_period(self): ).to_period() result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) - + result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_equal(result, result.values) - + # empty expected = PeriodIndex([], freq="W", name="foo") - + result = period_range(start=start, periods=0, freq="W", name="foo") tm.assert_index_equal(result, expected) From 24365ab9a8534a5170b908681864f161854a8381 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 17:01:06 +0100 Subject: [PATCH 05/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index ce1c439b04986..e7ce451103fce 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -54,6 +54,10 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_equal(result, result.values) + idx = period_range(start=start, end=end, freq="Q", name="foo") + result = idx == idx.values + assert result.all() + # empty expected = PeriodIndex([], freq="W", name="foo") From 6266771a26ef8bdc044933918900c8a1815892cf Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 17:54:18 +0100 Subject: [PATCH 06/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index e7ce451103fce..6662f45b08f69 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -51,9 +51,6 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) - result = period_range(start=start, end=end, freq="Q", name="foo") - tm.assert_equal(result, result.values) - idx = period_range(start=start, end=end, freq="Q", name="foo") result = idx == idx.values assert result.all() From e1ccaaecebf3b38eeccb1ebf8fcecb0772617d37 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 18:08:58 +0100 Subject: [PATCH 07/15] Update test_period_range.py added comment above test for resolved issue #21793 --- pandas/tests/indexes/period/test_period_range.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 6662f45b08f69..0a8a9964dfc59 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -51,6 +51,7 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) + #test for issue #21793 idx = period_range(start=start, end=end, freq="Q", name="foo") result = idx == idx.values assert result.all() From 4df4bc78bdd7aaaead5c8c425f1dd71142d5af6f Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 18:10:15 +0100 Subject: [PATCH 08/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 0a8a9964dfc59..4159d85c6a54a 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -51,7 +51,7 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) - #test for issue #21793 + # test for issue #21793 idx = period_range(start=start, end=end, freq="Q", name="foo") result = idx == idx.values assert result.all() From abce52f5d4741191646be471a601f284432f5b36 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 18:18:16 +0100 Subject: [PATCH 09/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 4159d85c6a54a..e59aa12fa9ea6 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -2,7 +2,7 @@ from pandas import NaT, Period, PeriodIndex, date_range, period_range import pandas._testing as tm - +import numpy as np class TestPeriodRange: @pytest.mark.parametrize("freq", ["D", "W", "M", "Q", "A"]) @@ -53,8 +53,13 @@ def test_construction_from_period(self): # test for issue #21793 idx = period_range(start=start, end=end, freq="Q", name="foo") - result = idx == idx.values - assert result.all() + result = idx.values + expected = np.array([Period('2017Q1', 'Q-DEC'), + Period('2017Q2', 'Q-DEC'), + Period('2017Q3', 'Q-DEC'), + Period('2017Q4', 'Q-DEC'), + Period('2018Q1', 'Q-DEC')]) + tm.assert_numpy_array_equal(result, expected) # empty expected = PeriodIndex([], freq="W", name="foo") From a0de23bb16272f219f570d0afe2880a81e3e8585 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 18:44:07 +0100 Subject: [PATCH 10/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index e59aa12fa9ea6..21568426b53c3 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -51,14 +51,10 @@ def test_construction_from_period(self): result = period_range(start=start, end=end, freq="Q", name="foo") tm.assert_index_equal(result, expected) - # test for issue #21793 + # test for issue # 21793 idx = period_range(start=start, end=end, freq="Q", name="foo") - result = idx.values - expected = np.array([Period('2017Q1', 'Q-DEC'), - Period('2017Q2', 'Q-DEC'), - Period('2017Q3', 'Q-DEC'), - Period('2017Q4', 'Q-DEC'), - Period('2018Q1', 'Q-DEC')]) + result = idx == idx.values + expected = np.array([True, True, True, True, True]) tm.assert_numpy_array_equal(result, expected) # empty From ae631915b4e3ea911989e3fa0f77143613ce20ec Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 18:49:22 +0100 Subject: [PATCH 11/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 21568426b53c3..251fba562fab2 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -1,8 +1,8 @@ import pytest - +import numpy as np from pandas import NaT, Period, PeriodIndex, date_range, period_range import pandas._testing as tm -import numpy as np + class TestPeriodRange: @pytest.mark.parametrize("freq", ["D", "W", "M", "Q", "A"]) From 054ade50f7b12d6390a80fc7051b0fbc8f755e28 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 19:18:50 +0100 Subject: [PATCH 12/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 251fba562fab2..595973f3f54e6 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -1,5 +1,5 @@ -import pytest import numpy as np +import pytest from pandas import NaT, Period, PeriodIndex, date_range, period_range import pandas._testing as tm From a40ab465f6a62686e4d1a3b4df53d81e87b7cc80 Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 19:42:19 +0100 Subject: [PATCH 13/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 595973f3f54e6..65cdd1fc56214 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -1,5 +1,6 @@ import numpy as np import pytest + from pandas import NaT, Period, PeriodIndex, date_range, period_range import pandas._testing as tm From b749f8e1df3caa9315b29c91a0be5748ad8c8f0e Mon Sep 17 00:00:00 2001 From: jnecus Date: Thu, 14 May 2020 20:51:24 +0100 Subject: [PATCH 14/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 65cdd1fc56214..4685850e75ba2 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -53,6 +53,10 @@ def test_construction_from_period(self): tm.assert_index_equal(result, expected) # test for issue # 21793 + start, end = Period("2017Q1", freq="Q"), Period("2018Q1", freq="Q") + expected = date_range( + start="2017-03-31", end="2018-03-31", freq="M", name="foo" + ).to_period() idx = period_range(start=start, end=end, freq="Q", name="foo") result = idx == idx.values expected = np.array([True, True, True, True, True]) From 14e2c7901ab139079a625bc435cb288a1724ddf8 Mon Sep 17 00:00:00 2001 From: jnecus Date: Fri, 15 May 2020 10:06:59 +0100 Subject: [PATCH 15/15] Update test_period_range.py --- pandas/tests/indexes/period/test_period_range.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 4685850e75ba2..68b48a55957ff 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -54,9 +54,6 @@ def test_construction_from_period(self): # test for issue # 21793 start, end = Period("2017Q1", freq="Q"), Period("2018Q1", freq="Q") - expected = date_range( - start="2017-03-31", end="2018-03-31", freq="M", name="foo" - ).to_period() idx = period_range(start=start, end=end, freq="Q", name="foo") result = idx == idx.values expected = np.array([True, True, True, True, True])