From 44af936aeeb16874f5013a87c1ce033e17c25c54 Mon Sep 17 00:00:00 2001 From: itholic Date: Tue, 6 Oct 2020 09:59:10 +0900 Subject: [PATCH 1/2] Fix to_list work properly in pandas==0.23 --- databricks/koalas/series.py | 6 +++++- databricks/koalas/tests/test_series.py | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/databricks/koalas/series.py b/databricks/koalas/series.py index f6e011830d..64c3b0aa54 100644 --- a/databricks/koalas/series.py +++ b/databricks/koalas/series.py @@ -1478,7 +1478,11 @@ def to_list(self): to be small, as all the data is loaded into the driver's memory. """ - return self._to_internal_pandas().to_list() + # pandas<0.24 doesn't support `to_list()` as an alias for `tolist()` + if LooseVersion(pd.__version__) < LooseVersion("0.24"): + return self._to_internal_pandas().tolist() + else: + return self._to_internal_pandas().to_list() tolist = to_list diff --git a/databricks/koalas/tests/test_series.py b/databricks/koalas/tests/test_series.py index 9aa29f59d6..607c00e93e 100644 --- a/databricks/koalas/tests/test_series.py +++ b/databricks/koalas/tests/test_series.py @@ -860,8 +860,7 @@ def test_is_unique(self): self.assertEqual((pser + 1).is_unique, (kser + 1).is_unique) def test_to_list(self): - if LooseVersion(pd.__version__) >= LooseVersion("0.24.0"): - self.assertEqual(self.kser.to_list(), self.pser.to_list()) + self.assert_eq(self.kser.to_list(), self.pser.to_list()) def test_append(self): pser1 = pd.Series([1, 2, 3], name="0") From 6dbaddacfcc0be2bd4fdb546c34af1f451efcc02 Mon Sep 17 00:00:00 2001 From: itholic Date: Tue, 6 Oct 2020 11:23:58 +0900 Subject: [PATCH 2/2] separate test --- databricks/koalas/tests/test_series.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/databricks/koalas/tests/test_series.py b/databricks/koalas/tests/test_series.py index 607c00e93e..56248e56db 100644 --- a/databricks/koalas/tests/test_series.py +++ b/databricks/koalas/tests/test_series.py @@ -860,7 +860,10 @@ def test_is_unique(self): self.assertEqual((pser + 1).is_unique, (kser + 1).is_unique) def test_to_list(self): - self.assert_eq(self.kser.to_list(), self.pser.to_list()) + if LooseVersion(pd.__version__) >= LooseVersion("0.24.0"): + self.assert_eq(self.kser.to_list(), self.pser.to_list()) + else: + self.assert_eq(self.kser.tolist(), self.pser.tolist()) def test_append(self): pser1 = pd.Series([1, 2, 3], name="0")