This is an automated email from the ASF dual-hosted git repository. dongjoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new f9f413e5ff6a [SPARK-46871][PS][TESTS] Clean up the imports in `pyspark.pandas.tests.computation.*` f9f413e5ff6a is described below commit f9f413e5ff6abe00a664e2dc75fb0ade2ff2986a Author: Ruifeng Zheng <ruife...@apache.org> AuthorDate: Thu Jan 25 22:40:35 2024 -0800 [SPARK-46871][PS][TESTS] Clean up the imports in `pyspark.pandas.tests.computation.*` ### What changes were proposed in this pull request? Clean up the imports in `pyspark.pandas.tests.computation.*` ### Why are the changes needed? 1, remove unused imports; 2, define the test dataset in the vanilla side, so that won't need to define it again in the parity tests; ### Does this PR introduce _any_ user-facing change? no, test-only ### How was this patch tested? ci ### Was this patch authored or co-authored using generative AI tooling? no Closes #44895 from zhengruifeng/ps_test_comput_cleanup. Authored-by: Ruifeng Zheng <ruife...@apache.org> Signed-off-by: Dongjoon Hyun <dongj...@apache.org> --- python/pyspark/pandas/tests/computation/test_any_all.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_apply_func.py | 12 ++++++++++-- python/pyspark/pandas/tests/computation/test_binary_ops.py | 12 ++++++++++-- python/pyspark/pandas/tests/computation/test_combine.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_compute.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_corr.py | 6 +++++- python/pyspark/pandas/tests/computation/test_corrwith.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_cov.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_cumulative.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_describe.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_eval.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_melt.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_missing_data.py | 8 ++++++-- python/pyspark/pandas/tests/computation/test_pivot.py | 4 ++-- python/pyspark/pandas/tests/computation/test_pivot_table.py | 4 ++-- .../pyspark/pandas/tests/computation/test_pivot_table_adv.py | 4 ++-- .../pandas/tests/computation/test_pivot_table_multi_idx.py | 4 ++-- .../tests/computation/test_pivot_table_multi_idx_adv.py | 4 ++-- python/pyspark/pandas/tests/computation/test_stats.py | 6 +++++- .../pandas/tests/connect/computation/test_parity_any_all.py | 11 ++++++----- .../tests/connect/computation/test_parity_apply_func.py | 9 ++++----- .../tests/connect/computation/test_parity_binary_ops.py | 11 ++++++----- .../pandas/tests/connect/computation/test_parity_combine.py | 6 +++++- .../pandas/tests/connect/computation/test_parity_compute.py | 6 +++++- .../pandas/tests/connect/computation/test_parity_corr.py | 7 +++++-- .../pandas/tests/connect/computation/test_parity_corrwith.py | 11 ++++++----- .../pandas/tests/connect/computation/test_parity_cov.py | 11 ++++++----- .../tests/connect/computation/test_parity_cumulative.py | 9 ++++----- .../pandas/tests/connect/computation/test_parity_describe.py | 5 +---- .../pandas/tests/connect/computation/test_parity_eval.py | 11 ++++++----- .../pandas/tests/connect/computation/test_parity_melt.py | 11 ++++++----- .../tests/connect/computation/test_parity_missing_data.py | 9 ++++----- 32 files changed, 164 insertions(+), 89 deletions(-) diff --git a/python/pyspark/pandas/tests/computation/test_any_all.py b/python/pyspark/pandas/tests/computation/test_any_all.py index 5e946be7b08b..784e355f3b58 100644 --- a/python/pyspark/pandas/tests/computation/test_any_all.py +++ b/python/pyspark/pandas/tests/computation/test_any_all.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -149,7 +149,11 @@ class FrameAnyAllMixin: psdf.any(axis=1) -class FrameAnyAllTests(FrameAnyAllMixin, ComparisonTestBase, SQLTestUtils): +class FrameAnyAllTests( + FrameAnyAllMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_apply_func.py b/python/pyspark/pandas/tests/computation/test_apply_func.py index de82c061b58c..ad43a2f2b270 100644 --- a/python/pyspark/pandas/tests/computation/test_apply_func.py +++ b/python/pyspark/pandas/tests/computation/test_apply_func.py @@ -25,7 +25,7 @@ import pandas as pd from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.pandas.config import option_context -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -40,6 +40,10 @@ class FrameApplyFunctionMixin: index=np.random.rand(9), ) + @property + def psdf(self): + return ps.from_pandas(self.pdf) + def test_apply(self): pdf = pd.DataFrame( { @@ -553,7 +557,11 @@ class FrameApplyFunctionMixin: self.assertRaises(ValueError, lambda: psdf.agg(("sum", "min"))) -class FrameApplyFunctionTests(FrameApplyFunctionMixin, ComparisonTestBase, SQLTestUtils): +class FrameApplyFunctionTests( + FrameApplyFunctionMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_binary_ops.py b/python/pyspark/pandas/tests/computation/test_binary_ops.py index 09de7d6d015e..966b3d9cee7e 100644 --- a/python/pyspark/pandas/tests/computation/test_binary_ops.py +++ b/python/pyspark/pandas/tests/computation/test_binary_ops.py @@ -21,7 +21,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -35,6 +35,10 @@ class FrameBinaryOpsMixin: index=np.random.rand(9), ) + @property + def psdf(self): + return ps.from_pandas(self.pdf) + def test_binary_operators(self): pdf = pd.DataFrame( {"A": [0, 2, 4], "B": [4, 2, 0], "X": [-1, 10, 0]}, index=np.random.rand(3) @@ -207,7 +211,11 @@ class FrameBinaryOpsMixin: self.assert_eq(psdf.rfloordiv(10), expected_result) -class FrameBinaryOpsTests(FrameBinaryOpsMixin, ComparisonTestBase, SQLTestUtils): +class FrameBinaryOpsTests( + FrameBinaryOpsMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_combine.py b/python/pyspark/pandas/tests/computation/test_combine.py index 4de4dd1cccbd..426ee436e9f8 100644 --- a/python/pyspark/pandas/tests/computation/test_combine.py +++ b/python/pyspark/pandas/tests/computation/test_combine.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -588,7 +588,11 @@ class FrameCombineMixin: ) -class FrameCombineTests(FrameCombineMixin, ComparisonTestBase, SQLTestUtils): +class FrameCombineTests( + FrameCombineMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_compute.py b/python/pyspark/pandas/tests/computation/test_compute.py index 21dcb9b1b05d..043a7b9cf9d0 100644 --- a/python/pyspark/pandas/tests/computation/test_compute.py +++ b/python/pyspark/pandas/tests/computation/test_compute.py @@ -21,7 +21,7 @@ import pandas as pd from pyspark.sql import functions as sf from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -432,7 +432,11 @@ class FrameComputeMixin: self.assert_eq(pdf.prod(numeric_only=True), psdf.prod().sort_index(), check_exact=False) -class FrameComputeTests(FrameComputeMixin, ComparisonTestBase, SQLTestUtils): +class FrameComputeTests( + FrameComputeMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_corr.py b/python/pyspark/pandas/tests/computation/test_corr.py index a7b06aa2928a..99dc1733539a 100644 --- a/python/pyspark/pandas/tests/computation/test_corr.py +++ b/python/pyspark/pandas/tests/computation/test_corr.py @@ -206,7 +206,11 @@ class FrameCorrMixin: self.assert_eq(psdf.corr(), pdf.corr(numeric_only=True), check_exact=False) -class FrameCorrTests(FrameCorrMixin, PandasOnSparkTestCase, SQLTestUtils): +class FrameCorrTests( + FrameCorrMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_corrwith.py b/python/pyspark/pandas/tests/computation/test_corrwith.py index 5ec29c9e5963..62b8161ca05e 100644 --- a/python/pyspark/pandas/tests/computation/test_corrwith.py +++ b/python/pyspark/pandas/tests/computation/test_corrwith.py @@ -19,7 +19,7 @@ import unittest import numpy as np from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -64,7 +64,11 @@ class FrameCorrwithMixin: self.assert_eq(p_corr.sort_index(), ps_corr.sort_index(), almost=True) -class FrameCorrwithTests(FrameCorrwithMixin, ComparisonTestBase, SQLTestUtils): +class FrameCorrwithTests( + FrameCorrwithMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_cov.py b/python/pyspark/pandas/tests/computation/test_cov.py index fb40884e1c3d..94da5d79526f 100644 --- a/python/pyspark/pandas/tests/computation/test_cov.py +++ b/python/pyspark/pandas/tests/computation/test_cov.py @@ -21,7 +21,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -100,7 +100,11 @@ class FrameCovMixin: self.assert_eq(pdf.cov(numeric_only=True), psdf.cov()) -class FrameCovTests(FrameCovMixin, ComparisonTestBase, SQLTestUtils): +class FrameCovTests( + FrameCovMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_cumulative.py b/python/pyspark/pandas/tests/computation/test_cumulative.py index f6c1d893b158..0218360ba863 100644 --- a/python/pyspark/pandas/tests/computation/test_cumulative.py +++ b/python/pyspark/pandas/tests/computation/test_cumulative.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -110,7 +110,11 @@ class FrameCumulativeMixin: self._test_cumprod(pdf, psdf) -class FrameCumulativeTests(FrameCumulativeMixin, ComparisonTestBase, SQLTestUtils): +class FrameCumulativeTests( + FrameCumulativeMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_describe.py b/python/pyspark/pandas/tests/computation/test_describe.py index bf18f3027935..f88eac7942d1 100644 --- a/python/pyspark/pandas/tests/computation/test_describe.py +++ b/python/pyspark/pandas/tests/computation/test_describe.py @@ -21,7 +21,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -229,7 +229,11 @@ class FrameDescribeMixin: ) -class FrameDescribeTests(FrameDescribeMixin, ComparisonTestBase, SQLTestUtils): +class FrameDescribeTests( + FrameDescribeMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_eval.py b/python/pyspark/pandas/tests/computation/test_eval.py index 712da1478efe..235035f838b1 100644 --- a/python/pyspark/pandas/tests/computation/test_eval.py +++ b/python/pyspark/pandas/tests/computation/test_eval.py @@ -20,7 +20,7 @@ import unittest import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -60,7 +60,11 @@ class FrameEvalMixin: self.assertRaises(TypeError, lambda: psdf.eval("x.a + y.b")) -class FrameEvalTests(FrameEvalMixin, ComparisonTestBase, SQLTestUtils): +class FrameEvalTests( + FrameEvalMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_melt.py b/python/pyspark/pandas/tests/computation/test_melt.py index 8cb7da1b0506..982ab7604583 100644 --- a/python/pyspark/pandas/tests/computation/test_melt.py +++ b/python/pyspark/pandas/tests/computation/test_melt.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.utils import name_like_string @@ -173,7 +173,11 @@ class FrameMeltMixin: ) -class FrameMeltTests(FrameMeltMixin, ComparisonTestBase, SQLTestUtils): +class FrameMeltTests( + FrameMeltMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_missing_data.py b/python/pyspark/pandas/tests/computation/test_missing_data.py index c11c454af6a2..c777499aea85 100644 --- a/python/pyspark/pandas/tests/computation/test_missing_data.py +++ b/python/pyspark/pandas/tests/computation/test_missing_data.py @@ -21,7 +21,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -455,7 +455,11 @@ class FrameMissingDataMixin: self.assert_eq(pdf, psdf) -class FrameMissingDataTests(FrameMissingDataMixin, ComparisonTestBase, SQLTestUtils): +class FrameMissingDataTests( + FrameMissingDataMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/computation/test_pivot.py b/python/pyspark/pandas/tests/computation/test_pivot.py index 2670fa384dc7..cdb9c1571cf4 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot.py +++ b/python/pyspark/pandas/tests/computation/test_pivot.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -191,7 +191,7 @@ class FramePivotMixin: class FramePivotTests( FramePivotMixin, - ComparisonTestBase, + PandasOnSparkTestCase, SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_pivot_table.py b/python/pyspark/pandas/tests/computation/test_pivot_table.py index 5bca2cee55f5..037ff1fd8687 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot_table.py +++ b/python/pyspark/pandas/tests/computation/test_pivot_table.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -75,7 +75,7 @@ class PivotTableMixin: class PivotTableTests( PivotTableMixin, - ComparisonTestBase, + PandasOnSparkTestCase, SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_pivot_table_adv.py b/python/pyspark/pandas/tests/computation/test_pivot_table_adv.py index d4aa75607529..3d9eac5a09f2 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot_table_adv.py +++ b/python/pyspark/pandas/tests/computation/test_pivot_table_adv.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -75,7 +75,7 @@ class PivotTableAdvMixin: class PivotTableAdvTests( PivotTableAdvMixin, - ComparisonTestBase, + PandasOnSparkTestCase, SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx.py b/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx.py index fbf7cd480114..3a499e39875d 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx.py +++ b/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -73,7 +73,7 @@ class PivotTableMultiIdxMixin: class PivotTableMultiIdxTests( PivotTableMultiIdxMixin, - ComparisonTestBase, + PandasOnSparkTestCase, SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx_adv.py b/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx_adv.py index 16a8ca2c0869..ed8c4aedc8c1 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx_adv.py +++ b/python/pyspark/pandas/tests/computation/test_pivot_table_multi_idx_adv.py @@ -20,7 +20,7 @@ import numpy as np import pandas as pd from pyspark import pandas as ps -from pyspark.testing.pandasutils import ComparisonTestBase +from pyspark.testing.pandasutils import PandasOnSparkTestCase from pyspark.testing.sqlutils import SQLTestUtils @@ -75,7 +75,7 @@ class PivotTableMultiIdxAdvMixin: class PivotTableMultiIdxAdvTests( PivotTableMultiIdxAdvMixin, - ComparisonTestBase, + PandasOnSparkTestCase, SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_stats.py b/python/pyspark/pandas/tests/computation/test_stats.py index c18c489617c2..5db58a0769e2 100644 --- a/python/pyspark/pandas/tests/computation/test_stats.py +++ b/python/pyspark/pandas/tests/computation/test_stats.py @@ -306,7 +306,11 @@ class StatsTestsMixin: psdf.s.sum() -class StatsTests(StatsTestsMixin, PandasOnSparkTestCase, SQLTestUtils): +class StatsTests( + StatsTestsMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_any_all.py b/python/pyspark/pandas/tests/connect/computation/test_parity_any_all.py index 29aa23389782..b53ab865b3c9 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_any_all.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_any_all.py @@ -16,16 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_any_all import FrameAnyAllMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityAnyAllTests(FrameAnyAllMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) +class FrameParityAnyAllTests( + FrameAnyAllMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_apply_func.py b/python/pyspark/pandas/tests/connect/computation/test_parity_apply_func.py index 3a720846a9f9..85d2338d5a8a 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_apply_func.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_apply_func.py @@ -16,18 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_apply_func import FrameApplyFunctionMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils class FrameParityApplyFunctionTests( - FrameApplyFunctionMixin, PandasOnSparkTestUtils, ReusedConnectTestCase + FrameApplyFunctionMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, ): - @property - def psdf(self): - return ps.from_pandas(self.pdf) + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_binary_ops.py b/python/pyspark/pandas/tests/connect/computation/test_parity_binary_ops.py index 2b10c3311815..9a848cf1a120 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_binary_ops.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_binary_ops.py @@ -16,16 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_binary_ops import FrameBinaryOpsMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityBinaryOpsTests(FrameBinaryOpsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) +class FrameParityBinaryOpsTests( + FrameBinaryOpsMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_combine.py b/python/pyspark/pandas/tests/connect/computation/test_parity_combine.py index af23600055e0..cddadad1b5ec 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_combine.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_combine.py @@ -21,7 +21,11 @@ from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityCombineTests(FrameCombineMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): +class FrameParityCombineTests( + FrameCombineMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): pass diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_compute.py b/python/pyspark/pandas/tests/connect/computation/test_parity_compute.py index 3e76cb621f05..cfffee0644a4 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_compute.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_compute.py @@ -21,7 +21,11 @@ from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityComputeTests(FrameComputeMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): +class FrameParityComputeTests( + FrameComputeMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): pass diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_corr.py b/python/pyspark/pandas/tests/connect/computation/test_parity_corr.py index acf36b07829a..9419bd6af337 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_corr.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_corr.py @@ -16,13 +16,16 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_corr import FrameCorrMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityCorrTests(FrameCorrMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): +class FrameParityCorrTests( + FrameCorrMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): pass diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_corrwith.py b/python/pyspark/pandas/tests/connect/computation/test_parity_corrwith.py index 7c6af99b3c41..3150060a5609 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_corrwith.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_corrwith.py @@ -16,16 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_corrwith import FrameCorrwithMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityCorrwithTests(FrameCorrwithMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) +class FrameParityCorrwithTests( + FrameCorrwithMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_cov.py b/python/pyspark/pandas/tests/connect/computation/test_parity_cov.py index 22abeec009d1..21b93822aafc 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_cov.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_cov.py @@ -16,16 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_cov import FrameCovMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityCovTests(FrameCovMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) +class FrameParityCovTests( + FrameCovMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_cumulative.py b/python/pyspark/pandas/tests/connect/computation/test_parity_cumulative.py index e14d296749c0..315cf1181404 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_cumulative.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_cumulative.py @@ -16,18 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_cumulative import FrameCumulativeMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils class FrameParityCumulativeTests( - FrameCumulativeMixin, PandasOnSparkTestUtils, ReusedConnectTestCase + FrameCumulativeMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, ): - @property - def psdf(self): - return ps.from_pandas(self.pdf) + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_describe.py b/python/pyspark/pandas/tests/connect/computation/test_parity_describe.py index 0ca873590ad5..fac6ff082df5 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_describe.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_describe.py @@ -16,16 +16,13 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_describe import FrameDescribeMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils class FrameParityDescribeTests(FrameDescribeMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_eval.py b/python/pyspark/pandas/tests/connect/computation/test_parity_eval.py index 58a347aebdb4..51c85a4bfb17 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_eval.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_eval.py @@ -16,16 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_eval import FrameEvalMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityEvalTests(FrameEvalMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) +class FrameParityEvalTests( + FrameEvalMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_melt.py b/python/pyspark/pandas/tests/connect/computation/test_parity_melt.py index cda16eb61bf7..cdee2be54575 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_melt.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_melt.py @@ -16,16 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_melt import FrameMeltMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils -class FrameParityMeltTests(FrameMeltMixin, PandasOnSparkTestUtils, ReusedConnectTestCase): - @property - def psdf(self): - return ps.from_pandas(self.pdf) +class FrameParityMeltTests( + FrameMeltMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, +): + pass if __name__ == "__main__": diff --git a/python/pyspark/pandas/tests/connect/computation/test_parity_missing_data.py b/python/pyspark/pandas/tests/connect/computation/test_parity_missing_data.py index d2ff09e5e8a5..a8aec8d4b0da 100644 --- a/python/pyspark/pandas/tests/connect/computation/test_parity_missing_data.py +++ b/python/pyspark/pandas/tests/connect/computation/test_parity_missing_data.py @@ -16,18 +16,17 @@ # import unittest -from pyspark import pandas as ps from pyspark.pandas.tests.computation.test_missing_data import FrameMissingDataMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils class FrameParityMissingDataTests( - FrameMissingDataMixin, PandasOnSparkTestUtils, ReusedConnectTestCase + FrameMissingDataMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, ): - @property - def psdf(self): - return ps.from_pandas(self.pdf) + pass if __name__ == "__main__": --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org