diff --git a/python/pyspark/pandas/tests/computation/test_any_all.py b/python/pyspark/pandas/tests/computation/test_any_all.py index 418d78c0d3137..ce5fab8e4b5f3 100644 --- a/python/pyspark/pandas/tests/computation/test_any_all.py +++ b/python/pyspark/pandas/tests/computation/test_any_all.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameAnyAllMixin: @@ -263,7 +262,6 @@ def test_any(self): 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 7ff75d613a8f4..9d589b41f5845 100644 --- a/python/pyspark/pandas/tests/computation/test_apply_func.py +++ b/python/pyspark/pandas/tests/computation/test_apply_func.py @@ -24,7 +24,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.config import option_context from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Function application, GroupBy & Window' @@ -571,7 +570,6 @@ def test_aggregate(self): 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 b0e83c02305c7..50e7518ba7a29 100644 --- a/python/pyspark/pandas/tests/computation/test_binary_ops.py +++ b/python/pyspark/pandas/tests/computation/test_binary_ops.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Binary operator functions' @@ -319,7 +318,6 @@ def test_rfloordiv(self): 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 b94e49cfa1a64..c55a7a3cbb4c6 100644 --- a/python/pyspark/pandas/tests/computation/test_combine.py +++ b/python/pyspark/pandas/tests/computation/test_combine.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Combining / joining / merging' @@ -769,7 +768,6 @@ def test_update_filter_func_with_nulls(self): 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 da217e6f51e50..4538509cd4d36 100644 --- a/python/pyspark/pandas/tests/computation/test_compute.py +++ b/python/pyspark/pandas/tests/computation/test_compute.py @@ -21,7 +21,6 @@ from pyspark.sql import functions as sf from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Computations / Descriptive Stats' @@ -570,7 +569,6 @@ def test_product(self): 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 39306b39f0b16..6b3ab85f3fd1c 100644 --- a/python/pyspark/pandas/tests/computation/test_corr.py +++ b/python/pyspark/pandas/tests/computation/test_corr.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase, SPARK_CONF_ARROW_ENABLED -from pyspark.testing.sqlutils import SQLTestUtils class FrameCorrMixin: @@ -209,7 +208,6 @@ def test_cov_corr_meta(self): 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 24e2b4526809e..fe096b6b2380a 100644 --- a/python/pyspark/pandas/tests/computation/test_corrwith.py +++ b/python/pyspark/pandas/tests/computation/test_corrwith.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameCorrwithMixin: @@ -66,7 +65,6 @@ def _test_corrwith(self, psdf, psobj): 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 90cefc0ff3835..5a39c9bded35c 100644 --- a/python/pyspark/pandas/tests/computation/test_cov.py +++ b/python/pyspark/pandas/tests/computation/test_cov.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameCovMixin: @@ -102,7 +101,6 @@ def test_cov(self): 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 79dc36512cf67..514bf564e915c 100644 --- a/python/pyspark/pandas/tests/computation/test_cumulative.py +++ b/python/pyspark/pandas/tests/computation/test_cumulative.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameCumulativeMixin: @@ -122,7 +121,6 @@ def test_cumprod_multiindex_columns(self): 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 3dbff439a6647..ad3377b9df605 100644 --- a/python/pyspark/pandas/tests/computation/test_describe.py +++ b/python/pyspark/pandas/tests/computation/test_describe.py @@ -22,7 +22,6 @@ from pyspark.loose_version import LooseVersion from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameDescribeMixin: @@ -244,7 +243,6 @@ def test_describe_empty(self): 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 53b7aecef2ecb..46bdc11d074fe 100644 --- a/python/pyspark/pandas/tests/computation/test_eval.py +++ b/python/pyspark/pandas/tests/computation/test_eval.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameEvalMixin: @@ -62,7 +61,6 @@ def test_eval(self): class FrameEvalTests( FrameEvalMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_idxmax_idxmin.py b/python/pyspark/pandas/tests/computation/test_idxmax_idxmin.py index 649f3b2104efa..9a3ca66f4ed68 100644 --- a/python/pyspark/pandas/tests/computation/test_idxmax_idxmin.py +++ b/python/pyspark/pandas/tests/computation/test_idxmax_idxmin.py @@ -20,7 +20,6 @@ from pyspark.loose_version import LooseVersion from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameIdxMaxMinMixin: @@ -280,7 +279,6 @@ def test_idxmin_multiindex_columns(self): class FrameIdxMaxMinTests( FrameIdxMaxMinMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_melt.py b/python/pyspark/pandas/tests/computation/test_melt.py index 82d741b5795f4..73b0f12836f17 100644 --- a/python/pyspark/pandas/tests/computation/test_melt.py +++ b/python/pyspark/pandas/tests/computation/test_melt.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.utils import name_like_string @@ -168,7 +167,6 @@ def test_melt(self): 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 ae1f68cb98899..75e12cf6978d5 100644 --- a/python/pyspark/pandas/tests/computation/test_missing_data.py +++ b/python/pyspark/pandas/tests/computation/test_missing_data.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Missing data handling' @@ -490,7 +489,6 @@ def test_pad(self): 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 632bb82911c47..75b583beff383 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot.py +++ b/python/pyspark/pandas/tests/computation/test_pivot.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FramePivotMixin: @@ -191,7 +190,6 @@ def test_pivot_table_errors(self): class FramePivotTests( FramePivotMixin, 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 83c315ecf09b4..d347eb2c75805 100644 --- a/python/pyspark/pandas/tests/computation/test_pivot_table.py +++ b/python/pyspark/pandas/tests/computation/test_pivot_table.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class PivotTableMixin: @@ -75,7 +74,6 @@ def test_pivot_table(self): class PivotTableTests( PivotTableMixin, 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 ec8cc80888263..ba916fecb657f 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,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class PivotTableAdvMixin: @@ -75,7 +74,6 @@ def test_pivot_table(self): class PivotTableAdvTests( PivotTableAdvMixin, 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 43c79712f3cf6..077f790f7d2ba 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,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class PivotTableMultiIdxMixin: @@ -73,7 +72,6 @@ def test_pivot_table(self): class PivotTableMultiIdxTests( PivotTableMultiIdxMixin, 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 7503f2daeba34..1b3b9634a0bf7 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,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class PivotTableMultiIdxAdvMixin: @@ -75,7 +74,6 @@ def test_pivot_table(self): class PivotTableMultiIdxAdvTests( PivotTableMultiIdxAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/computation/test_stats.py b/python/pyspark/pandas/tests/computation/test_stats.py index 6a3ce30060a5f..f12f28562c23e 100644 --- a/python/pyspark/pandas/tests/computation/test_stats.py +++ b/python/pyspark/pandas/tests/computation/test_stats.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class StatsTestsMixin: @@ -313,7 +312,6 @@ def test_numeric_only_unsupported(self): class StatsTests( StatsTestsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_align.py b/python/pyspark/pandas/tests/diff_frames_ops/test_align.py index e419af429dbda..f09f54d8579b4 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_align.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_align.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesAlignMixin: @@ -101,7 +100,7 @@ def test_align(self): self.assertRaises(ValueError, lambda: psdf1.align(psdf3, axis=1)) -class DiffFramesAlignTests(DiffFramesAlignMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesAlignTests(DiffFramesAlignMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic.py b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic.py index 09fc43d59646d..2b483c35ff8bc 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_float_dtypes_available @@ -183,7 +182,6 @@ def test_multi_index_arithmetic(self): class ArithmeticTests( ArithmeticMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain.py b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain.py index 876c95ed5f5b1..338bbe2dac823 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_float_dtypes_available @@ -176,7 +175,6 @@ def test_arithmetic_chain(self): class ArithmeticChainTests( ArithmeticChainMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext.py b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext.py index eb96147e1ea1b..a64458f3e6622 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext.py @@ -20,7 +20,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_dtypes_available from pyspark.pandas.tests.diff_frames_ops.test_arithmetic_chain import ( ArithmeticChainTestingFuncMixin, @@ -102,7 +101,6 @@ def test_arithmetic_chain_extension_dtypes(self): class ArithmeticChainExtTests( ArithmeticChainExtMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext_float.py b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext_float.py index 5e3664fdf0613..e3feb5d81ebd5 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext_float.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain_ext_float.py @@ -20,7 +20,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_float_dtypes_available from pyspark.pandas.tests.diff_frames_ops.test_arithmetic_chain import ( ArithmeticChainTestingFuncMixin, @@ -104,7 +103,6 @@ def test_arithmetic_chain_extension_float_dtypes(self): class ArithmeticChainExtFloatTests( ArithmeticChainExtFloatMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext.py b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext.py index ef796c4943d22..091e0280976ab 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext.py @@ -20,7 +20,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_dtypes_available from pyspark.pandas.tests.diff_frames_ops.test_arithmetic import ArithmeticMixin @@ -81,7 +80,6 @@ def test_arithmetic_extension_dtypes(self): class ArithmeticExtTests( ArithmeticExtMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext_float.py b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext_float.py index 1c412e4260df9..a761b47bb01fe 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext_float.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext_float.py @@ -20,7 +20,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_float_dtypes_available from pyspark.pandas.tests.diff_frames_ops.test_arithmetic import ArithmeticMixin @@ -81,7 +80,6 @@ def test_arithmetic_extension_float_dtypes(self): class ArithmeticExtFloatTests( ArithmeticExtFloatMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_assign_frame.py b/python/pyspark/pandas/tests/diff_frames_ops/test_assign_frame.py index 823e127a23de7..794069980024d 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_assign_frame.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_assign_frame.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class AssignFrameMixin: @@ -225,7 +224,6 @@ def test_multi_index_assignment_frame(self): class AssignFrameTests( AssignFrameMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_assign_series.py b/python/pyspark/pandas/tests/diff_frames_ops/test_assign_series.py index caf9f67b2d8fd..2eb3f7274d629 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_assign_series.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_assign_series.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class AssignSeriesMixin: @@ -223,7 +222,6 @@ def test_multi_index_assignment_series(self): class AssignSeriesTests( AssignSeriesMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_basic.py b/python/pyspark/pandas/tests/diff_frames_ops/test_basic.py index 3b6b95b00e131..79d471620f2cc 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_basic.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_basic.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class BasicMixin: @@ -221,7 +220,6 @@ def test_different_columns(self): class BasicTests( BasicMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_basic_slow.py b/python/pyspark/pandas/tests/diff_frames_ops/test_basic_slow.py index 0e545f0d182d1..da3e8754e1d84 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_basic_slow.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_basic_slow.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesBasicSlowMixin: @@ -181,7 +180,7 @@ def test_rank(self): ) -class DiffFramesBasicSlowTests(DiffFramesBasicSlowMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesBasicSlowTests(DiffFramesBasicSlowMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_bitwise.py b/python/pyspark/pandas/tests/diff_frames_ops/test_bitwise.py index 30c52cf9aa978..564bf9e195449 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_bitwise.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_bitwise.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.typedef.typehints import extension_object_dtypes_available @@ -92,7 +91,6 @@ def test_bitwise_extension_dtype(self): class BitwiseTests( BitwiseMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_combine_first.py b/python/pyspark/pandas/tests/diff_frames_ops/test_combine_first.py index 8532424220660..da16d8fa6b067 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_combine_first.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_combine_first.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class CombineFirstMixin: @@ -92,7 +91,6 @@ def test_combine_first(self): class CombineFirstTests( CombineFirstMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_compare_series.py b/python/pyspark/pandas/tests/diff_frames_ops/test_compare_series.py index 1ee9fbab55f95..dc8cb8398c481 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_compare_series.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_compare_series.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class CompareSeriesMixin: @@ -137,7 +136,6 @@ def test_compare(self): class CompareSeriesTests( CompareSeriesMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_concat_inner.py b/python/pyspark/pandas/tests/diff_frames_ops/test_concat_inner.py index 7ff9c24c2a476..1fe2f37b544eb 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_concat_inner.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_concat_inner.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class ConcatTestingFuncMixin: @@ -105,7 +104,6 @@ def test_concat_column_axis_inner(self): class ConcatInnerTests( ConcatInnerMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_concat_outer.py b/python/pyspark/pandas/tests/diff_frames_ops/test_concat_outer.py index 681a29b3619a8..42e0ded722c82 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_concat_outer.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_concat_outer.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.diff_frames_ops.test_concat_inner import ConcatTestingFuncMixin @@ -63,7 +62,6 @@ def test_concat_column_axis_outer(self): class ConcatOuterTests( ConcatOuterMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_corrwith.py b/python/pyspark/pandas/tests/diff_frames_ops/test_corrwith.py index acfe014dee01a..5e0f0f8be4a91 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_corrwith.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_corrwith.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesCorrWithMixin: @@ -117,7 +116,6 @@ def _test_corrwith(self, psdf, psobj): class DiffFramesCorrWithTests( DiffFramesCorrWithMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_cov.py b/python/pyspark/pandas/tests/diff_frames_ops/test_cov.py index d4b8f6de13501..0e22ed07c41e1 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_cov.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_cov.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesCovMixin: @@ -73,7 +72,6 @@ def _test_cov(self, pser1, pser2): class DiffFramesCovTests( DiffFramesCovMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_dot_frame.py b/python/pyspark/pandas/tests/diff_frames_ops/test_dot_frame.py index 65452a018d435..a3fea0ae8e664 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_dot_frame.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_dot_frame.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesDotFrameMixin: @@ -85,7 +84,7 @@ def test_frame_dot(self): self.assert_eq((psdf + 1).dot(psdf[0] * 10), (pdf + 1).dot(pdf[0] * 10)) -class DiffFramesDotFrameTests(DiffFramesDotFrameMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesDotFrameTests(DiffFramesDotFrameMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_dot_series.py b/python/pyspark/pandas/tests/diff_frames_ops/test_dot_series.py index 40956309e16af..80504da2eccae 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_dot_series.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_dot_series.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesDotSeriesMixin: @@ -126,7 +125,7 @@ def test_series_dot(self): self.assert_eq(psser.dot(psser_other), 16381) -class DiffFramesDotSeriesTests(DiffFramesDotSeriesMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesDotSeriesTests(DiffFramesDotSeriesMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_error.py b/python/pyspark/pandas/tests/diff_frames_ops/test_error.py index f5882ca04c0ca..1476ac48538d9 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_error.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_error.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesErrorMixin: @@ -236,7 +235,6 @@ def test_series_eq(self): class DiffFramesErrorTests( DiffFramesErrorMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby.py index b6dddaeee16f7..1d89adf4667c5 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByMixin: @@ -109,7 +108,6 @@ def test_head(self): class GroupByTests( GroupByMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_aggregate.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_aggregate.py index c186c9f15fbe1..3b60a4aa16955 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_aggregate.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_aggregate.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByAggregateMixin: @@ -121,7 +120,6 @@ def sort(df): class GroupByAggregateTests( GroupByAggregateMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_apply.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_apply.py index 552580b0ceed8..179748c4872ef 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_apply.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_apply.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByApplyMixin: @@ -68,7 +67,6 @@ def test_apply_without_shortcut(self): class GroupByApplyTests( GroupByApplyMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_cumulative.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_cumulative.py index 32ef1bd416273..bedc4594a4d55 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_cumulative.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_cumulative.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByCumulativeMixin: @@ -164,7 +163,6 @@ def test_cumprod(self): class GroupByCumulativeTests( GroupByCumulativeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff.py index 18084d8176ffc..48423f81d2b2a 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByDiffMixin: @@ -64,7 +63,6 @@ def test_diff(self): class GroupByDiffTests( GroupByDiffMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff_len.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff_len.py index 25a2dbb37db01..74efe92ceef99 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff_len.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff_len.py @@ -21,7 +21,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByDiffLenMixin: @@ -87,7 +86,6 @@ def sort(df): class GroupByDiffLenTests( GroupByDiffLenMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding.py index d9e6fac4463c8..76c95f3f1e480 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByExpandingTestingFuncMixin: @@ -82,7 +81,6 @@ def test_groupby_expanding_sum(self): class GroupByExpandingTests( GroupByExpandingMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_adv.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_adv.py index f3a04dc70f337..1bd73738bd38c 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_adv.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_adv.py @@ -17,7 +17,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.diff_frames_ops.test_groupby_expanding import ( GroupByExpandingTestingFuncMixin, ) @@ -44,7 +43,6 @@ def test_groupby_expanding_var(self): class GroupByExpandingAdvTests( GroupByExpandingAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_count.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_count.py index ba564d9c10968..393acd6993dda 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_count.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding_count.py @@ -17,7 +17,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.diff_frames_ops.test_groupby_expanding import ( GroupByExpandingTestingFuncMixin, ) @@ -41,7 +40,6 @@ def test_groupby_expanding_count(self): class GroupByExpandingCountTests( GroupByExpandingCountMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_fillna.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_fillna.py index 8e26172189049..c61d213e6f84f 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_fillna.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_fillna.py @@ -21,7 +21,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByFillNAMixin: @@ -100,7 +99,6 @@ def test_fillna(self): class GroupByFillNATests( GroupByFillNAMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_filter.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_filter.py index e59c95e82a160..149d6170eb759 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_filter.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_filter.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByFilterMixin: @@ -64,7 +63,6 @@ def test_filter(self): class GroupByFilterTests( GroupByFilterMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling.py index 33919dcea5409..4e57a53be00d1 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByRollingTestingFuncMixin: @@ -82,7 +81,6 @@ def test_groupby_rolling_sum(self): class GroupByRollingTests( GroupByRollingMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_adv.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_adv.py index be9afd07ce7b9..e7d6a4988a1f3 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_adv.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_adv.py @@ -17,7 +17,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.diff_frames_ops.test_groupby_rolling import GroupByRollingTestingFuncMixin @@ -42,7 +41,6 @@ def test_groupby_rolling_var(self): class GroupByRollingAdvTests( GroupByRollingAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_count.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_count.py index f247ba3a12d60..8cb04ff8b944e 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_count.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_count.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByRollingCountMixin: @@ -68,7 +67,6 @@ def test_groupby_rolling_count(self): class GroupByRollingCountTests( GroupByRollingCountMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_shift.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_shift.py index cdf31212d8595..45006258ce819 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_shift.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_shift.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByShiftMixin: @@ -67,7 +66,6 @@ def test_shift(self): class GroupByShiftTests( GroupByShiftMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_split_apply_combine.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_split_apply_combine.py index 623480c31cc2c..5f36bd1ac88b4 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_split_apply_combine.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_split_apply_combine.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupBySACMixin: @@ -95,7 +94,6 @@ def sort(df): class GroupBySACTests( GroupBySACMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_transform.py b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_transform.py index 322cadd8ac6cd..04bf25338f8d0 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_transform.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_groupby_transform.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupByTransformMixin: @@ -64,7 +63,6 @@ def test_transform(self): class GroupByTransformTests( GroupByTransformMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_index.py b/python/pyspark/pandas/tests/diff_frames_ops/test_index.py index 0d3c4314fbfed..8056bc39504c3 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_index.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_index.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesIndexMixin: @@ -92,7 +91,7 @@ def test_multi_index_column_assignment_frame(self): psdf[("1", "2", "3")] = ps.Series([100, 200, 300, 200]) -class DiffFramesIndexTests(DiffFramesIndexMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesIndexTests(DiffFramesIndexMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_series.py b/python/pyspark/pandas/tests/diff_frames_ops/test_series.py index 0b3c16aae1a24..57a9f967c2029 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_series.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_series.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesSeriesMixin: @@ -119,7 +118,7 @@ def test_series_eq(self): self.assert_eq(pser == pandas_other, (psser == pandas_on_spark_other).sort_index()) -class DiffFramesSeriesTests(DiffFramesSeriesMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesSeriesTests(DiffFramesSeriesMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_frame.py b/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_frame.py index 45eb8a3705f27..eeb8000d00e53 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_frame.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_frame.py @@ -21,7 +21,6 @@ from pyspark.pandas.config import set_option, reset_option from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesSetItemFrameMixin: @@ -116,7 +115,7 @@ def test_frame_iloc_setitem(self): psdf.iloc[[0], 1] = 10 * another_psdf.max_speed -class DiffFramesSetItemFrameTests(DiffFramesSetItemFrameMixin, PandasOnSparkTestCase, SQLTestUtils): +class DiffFramesSetItemFrameTests(DiffFramesSetItemFrameMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_series.py b/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_series.py index 021684d539944..ef8facd04634e 100644 --- a/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_series.py +++ b/python/pyspark/pandas/tests/diff_frames_ops/test_setitem_series.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class DiffFramesSetItemSeriesMixin: @@ -163,9 +162,7 @@ def test_series_iloc_setitem(self): psser1.iloc[[1, 2]] = -psser_another -class DiffFramesSetItemSeriesTests( - DiffFramesSetItemSeriesMixin, PandasOnSparkTestCase, SQLTestUtils -): +class DiffFramesSetItemSeriesTests(DiffFramesSetItemSeriesMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/frame/test_attrs.py b/python/pyspark/pandas/tests/frame/test_attrs.py index c332134e04c76..4ca2b5aa61c9d 100644 --- a/python/pyspark/pandas/tests/frame/test_attrs.py +++ b/python/pyspark/pandas/tests/frame/test_attrs.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Attributes and underlying data' @@ -347,7 +346,6 @@ def test_empty_timestamp(self): class FrameAttrsTests( FrameAttrsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_axis.py b/python/pyspark/pandas/tests/frame/test_axis.py index 3437d91c8fefd..478114e750f60 100644 --- a/python/pyspark/pandas/tests/frame/test_axis.py +++ b/python/pyspark/pandas/tests/frame/test_axis.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameAxisMixin: @@ -121,7 +120,6 @@ def test_axis_on_dataframe(self): class FrameAxisTests( FrameAxisMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_constructor.py b/python/pyspark/pandas/tests/frame/test_constructor.py index 4e6c561f920b2..0c80d2bbb7955 100644 --- a/python/pyspark/pandas/tests/frame/test_constructor.py +++ b/python/pyspark/pandas/tests/frame/test_constructor.py @@ -29,7 +29,6 @@ from pyspark.pandas.utils import is_testing from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Constructor' @@ -576,7 +575,6 @@ def test_astype_extension_float_dtypes(self): class FrameConstructorTests( FrameConstructorMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_conversion.py b/python/pyspark/pandas/tests/frame/test_conversion.py index 996c7edd5d5be..a891806e6c05a 100644 --- a/python/pyspark/pandas/tests/frame/test_conversion.py +++ b/python/pyspark/pandas/tests/frame/test_conversion.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Conversion' @@ -57,7 +56,6 @@ def test_isnull(self): class FrameConversionTests( FrameConversionMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_reindexing.py b/python/pyspark/pandas/tests/frame/test_reindexing.py index 3e170ad2f4495..a923294725015 100644 --- a/python/pyspark/pandas/tests/frame/test_reindexing.py +++ b/python/pyspark/pandas/tests/frame/test_reindexing.py @@ -26,7 +26,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.config import option_context from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Reindexing / Selection / Label manipulation' @@ -960,7 +959,6 @@ def test_sample(self): class FrameReidexingTests( FrameReindexingMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_reshaping.py b/python/pyspark/pandas/tests/frame/test_reshaping.py index b5cf7c011f46c..d5d40dbf3d54d 100644 --- a/python/pyspark/pandas/tests/frame/test_reshaping.py +++ b/python/pyspark/pandas/tests/frame/test_reshaping.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import option_context from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Reshaping, sorting, transposing' @@ -468,7 +467,6 @@ def test_squeeze(self): class FrameReshapingTests( FrameReshapingMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_spark.py b/python/pyspark/pandas/tests/frame/test_spark.py index 7d83d7e3f4110..58a1c2d478af3 100644 --- a/python/pyspark/pandas/tests/frame/test_spark.py +++ b/python/pyspark/pandas/tests/frame/test_spark.py @@ -29,7 +29,6 @@ from pyspark.pandas.exceptions import PandasNotImplementedError from pyspark.pandas.missing.frame import MissingPandasLikeDataFrame from pyspark.testing.pandasutils import PandasOnSparkTestCase, SPARK_CONF_ARROW_ENABLED -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Spark-related' @@ -306,7 +305,6 @@ def test_missing(self): class FrameSparkTests( FrameSparkMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_take.py b/python/pyspark/pandas/tests/frame/test_take.py index bcaac5218a6de..5408f1aeaaf22 100644 --- a/python/pyspark/pandas/tests/frame/test_take.py +++ b/python/pyspark/pandas/tests/frame/test_take.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameTakeMixin: @@ -75,7 +74,6 @@ def test_take(self): class FrameTakeTests( FrameTakeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_take_adv.py b/python/pyspark/pandas/tests/frame/test_take_adv.py index 21f7c7180cbd7..d618cbfade2f7 100644 --- a/python/pyspark/pandas/tests/frame/test_take_adv.py +++ b/python/pyspark/pandas/tests/frame/test_take_adv.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameTakeAdvMixin: @@ -86,7 +85,6 @@ def test_take_adv(self): class FrameTakeAdvTests( FrameTakeAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_time_series.py b/python/pyspark/pandas/tests/frame/test_time_series.py index 9fe4b39073b93..47046ae459378 100644 --- a/python/pyspark/pandas/tests/frame/test_time_series.py +++ b/python/pyspark/pandas/tests/frame/test_time_series.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Time series-related' @@ -122,7 +121,6 @@ def test_to_datetime(self): class FrameTimeSeriesTests( FrameTimeSeriesMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/frame/test_truncate.py b/python/pyspark/pandas/tests/frame/test_truncate.py index b372791c70b87..b57aceb7a18d9 100644 --- a/python/pyspark/pandas/tests/frame/test_truncate.py +++ b/python/pyspark/pandas/tests/frame/test_truncate.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameTruncateMixin: @@ -116,7 +115,7 @@ def test_truncate(self): psdf.truncate("C", "B", axis=1) -class FrameTruncateTests(FrameTruncateMixin, PandasOnSparkTestCase, SQLTestUtils): +class FrameTruncateTests(FrameTruncateMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/groupby/test_aggregate.py b/python/pyspark/pandas/tests/groupby/test_aggregate.py index 5dd87e47aa711..478a5a390ee93 100644 --- a/python/pyspark/pandas/tests/groupby/test_aggregate.py +++ b/python/pyspark/pandas/tests/groupby/test_aggregate.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyAggregateMixin: @@ -272,7 +271,6 @@ def test_aggregate_relabel_multiindex(self): class GroupbyAggregateTests( GroupbyAggregateMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_apply_func.py b/python/pyspark/pandas/tests/groupby/test_apply_func.py index c8e2bf41b62ee..84ec87e057f30 100644 --- a/python/pyspark/pandas/tests/groupby/test_apply_func.py +++ b/python/pyspark/pandas/tests/groupby/test_apply_func.py @@ -22,7 +22,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.config import option_context from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyApplyFuncMixin: @@ -712,7 +711,6 @@ def test_filter(self): class GroupbyApplyFuncTests( GroupbyApplyFuncMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_corr.py b/python/pyspark/pandas/tests/groupby/test_corr.py index da07f98528fa9..006ad0eccbfca 100644 --- a/python/pyspark/pandas/tests/groupby/test_corr.py +++ b/python/pyspark/pandas/tests/groupby/test_corr.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class CorrMixin: @@ -66,7 +65,6 @@ def test_min_periods(self): class CorrTests( CorrMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_cov.py b/python/pyspark/pandas/tests/groupby/test_cov.py index 849e469b05000..0845247055cac 100644 --- a/python/pyspark/pandas/tests/groupby/test_cov.py +++ b/python/pyspark/pandas/tests/groupby/test_cov.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class CovMixin: @@ -113,7 +112,6 @@ def test_invalid_args(self): class CovTests( CovMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_cumulative.py b/python/pyspark/pandas/tests/groupby/test_cumulative.py index 665153fe0768d..c40b91e0d4a51 100644 --- a/python/pyspark/pandas/tests/groupby/test_cumulative.py +++ b/python/pyspark/pandas/tests/groupby/test_cumulative.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.exceptions import DataError from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyCumulativeMixin: @@ -390,7 +389,6 @@ def test_cumprod(self): class GroupbyCumulativeTests( GroupbyCumulativeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_describe.py b/python/pyspark/pandas/tests/groupby/test_describe.py index 026ca8466bca6..e255c62389c85 100644 --- a/python/pyspark/pandas/tests/groupby/test_describe.py +++ b/python/pyspark/pandas/tests/groupby/test_describe.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyDescribeMixin: @@ -186,7 +185,6 @@ def test_series_groupby_describe(self): class GroupbyDescribeTests( GroupbyDescribeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_head_tail.py b/python/pyspark/pandas/tests/groupby/test_head_tail.py index fb81891f54c14..7fdd1db906a1b 100644 --- a/python/pyspark/pandas/tests/groupby/test_head_tail.py +++ b/python/pyspark/pandas/tests/groupby/test_head_tail.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyHeadTailMixin: @@ -204,7 +203,6 @@ def test_tail(self): class GroupbyHeadTailTests( GroupbyHeadTailMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_index.py b/python/pyspark/pandas/tests/groupby/test_index.py index f43fd9549fb53..e4f9902952a4a 100644 --- a/python/pyspark/pandas/tests/groupby/test_index.py +++ b/python/pyspark/pandas/tests/groupby/test_index.py @@ -20,7 +20,6 @@ from pyspark.loose_version import LooseVersion from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyIndexMixin: @@ -282,7 +281,6 @@ def test_idxmax_idxmin_skipna_false_with_na(self): class GroupbyIndexTests( GroupbyIndexMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_missing_data.py b/python/pyspark/pandas/tests/groupby/test_missing_data.py index c7f6536380831..e302b9ab334b2 100644 --- a/python/pyspark/pandas/tests/groupby/test_missing_data.py +++ b/python/pyspark/pandas/tests/groupby/test_missing_data.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbyMissingDataMixin: @@ -322,7 +321,6 @@ def sort(df): class GroupbyMissingDataTests( GroupbyMissingDataMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply.py b/python/pyspark/pandas/tests/groupby/test_split_apply.py index 73018716e3137..27835788e7622 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class GroupbySplitApplyTestingFuncMixin: @@ -169,7 +168,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyTests( GroupbySplitApplyMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_count.py b/python/pyspark/pandas/tests/groupby/test_split_apply_count.py index 7c377bcc9184a..a8e026450c461 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_count.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_count.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyCountTests( GroupbySplitApplyCountMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_first.py b/python/pyspark/pandas/tests/groupby/test_split_apply_first.py index ddb1eeaa8bcca..8e8637b01deb7 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_first.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_first.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyFirstTests( GroupbySplitApplyFirstMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_last.py b/python/pyspark/pandas/tests/groupby/test_split_apply_last.py index a42801b637845..4657b332e1db3 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_last.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_last.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyBasicTests( GroupbySplitApplyLastMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_min_max.py b/python/pyspark/pandas/tests/groupby/test_split_apply_min_max.py index 8ab15a228bc5b..513993e355ab7 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_min_max.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_min_max.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyMMTests( GroupbySplitApplyMMMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_skew.py b/python/pyspark/pandas/tests/groupby/test_split_apply_skew.py index cc268f9afeb33..4bc839c669544 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_skew.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_skew.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplySkewTests( GroupbySplitApplySkewMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_std.py b/python/pyspark/pandas/tests/groupby/test_split_apply_std.py index 500d15b567f67..1d51c00e2ff98 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_std.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_std.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyStdTests( GroupbySplitApplyStdMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_split_apply_var.py b/python/pyspark/pandas/tests/groupby/test_split_apply_var.py index eb7866c4e9f0d..f6c5c0b9cc704 100644 --- a/python/pyspark/pandas/tests/groupby/test_split_apply_var.py +++ b/python/pyspark/pandas/tests/groupby/test_split_apply_var.py @@ -16,7 +16,6 @@ # from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_split_apply import GroupbySplitApplyTestingFuncMixin @@ -31,7 +30,6 @@ def test_split_apply_combine_on_series(self): class GroupbySplitApplyVarTests( GroupbySplitApplyVarMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_stat.py b/python/pyspark/pandas/tests/groupby/test_stat.py index 02578a71b5685..d1f44131db717 100644 --- a/python/pyspark/pandas/tests/groupby/test_stat.py +++ b/python/pyspark/pandas/tests/groupby/test_stat.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils using_pandas3 = LooseVersion(pd.__version__) >= "3.0.0" @@ -160,7 +159,6 @@ def test_median(self): class GroupbyStatTests( GroupbyStatMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/groupby/test_stat_adv.py b/python/pyspark/pandas/tests/groupby/test_stat_adv.py index 58470fdfd9ca1..f06645c2a8652 100644 --- a/python/pyspark/pandas/tests/groupby/test_stat_adv.py +++ b/python/pyspark/pandas/tests/groupby/test_stat_adv.py @@ -21,7 +21,6 @@ from pyspark.loose_version import LooseVersion from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.tests.groupby.test_stat import GroupbyStatTestingFuncMixin, using_pandas3 @@ -177,7 +176,6 @@ def test_nth(self): class GroupbyStatAdvTests( GroupbyStatAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_align.py b/python/pyspark/pandas/tests/indexes/test_align.py index b0c770084fc4d..5802e351bac15 100644 --- a/python/pyspark/pandas/tests/indexes/test_align.py +++ b/python/pyspark/pandas/tests/indexes/test_align.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameAlignMixin: @@ -72,7 +71,6 @@ def test_align(self): class FrameAlignTests( FrameAlignMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_append.py b/python/pyspark/pandas/tests/indexes/test_append.py index be42ad0ef49fd..3a59dde5fc675 100644 --- a/python/pyspark/pandas/tests/indexes/test_append.py +++ b/python/pyspark/pandas/tests/indexes/test_append.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class AppendMixin: @@ -111,7 +110,6 @@ def test_append(self): class AppendTests( AppendMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_conversion.py b/python/pyspark/pandas/tests/indexes/test_conversion.py index 308000884ab57..8146915ae359a 100644 --- a/python/pyspark/pandas/tests/indexes/test_conversion.py +++ b/python/pyspark/pandas/tests/indexes/test_conversion.py @@ -24,7 +24,6 @@ SPARK_CONF_ARROW_ENABLED, SPARK_CONF_PANDAS_STRUCT_MODE, ) -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import is_ansi_mode_test @@ -306,7 +305,6 @@ def test_to_numpy(self): class ConversionTests( ConversionMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_getattr.py b/python/pyspark/pandas/tests/indexes/test_getattr.py index f0c37d0319566..8d3604fa0ebd5 100644 --- a/python/pyspark/pandas/tests/indexes/test_getattr.py +++ b/python/pyspark/pandas/tests/indexes/test_getattr.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexGetattrMixin: @@ -61,7 +60,6 @@ def test_multi_index_getattr(self): class IndexGetattrTests( IndexGetattrMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_indexing.py b/python/pyspark/pandas/tests/indexes/test_indexing.py index 55efc5dc72e93..78975a457d588 100644 --- a/python/pyspark/pandas/tests/indexes/test_indexing.py +++ b/python/pyspark/pandas/tests/indexes/test_indexing.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.config import option_context from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils # This file contains test cases for 'Indexing, Iteration' @@ -421,7 +420,6 @@ def test_iter_dataframe(self): class FrameIndexingTests( FrameIndexingMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_indexing_adv.py b/python/pyspark/pandas/tests/indexes/test_indexing_adv.py index 90c9d5dbb0ef1..426496e0dba00 100644 --- a/python/pyspark/pandas/tests/indexes/test_indexing_adv.py +++ b/python/pyspark/pandas/tests/indexes/test_indexing_adv.py @@ -25,7 +25,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.exceptions import SparkPandasNotImplementedError from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexingAdvMixin: @@ -393,7 +392,6 @@ def test_index_operator_int(self): class IndexingAdvTests( IndexingAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_indexing_iloc.py b/python/pyspark/pandas/tests/indexes/test_indexing_iloc.py index ce3fc7d300706..8a54ed0069ec4 100644 --- a/python/pyspark/pandas/tests/indexes/test_indexing_iloc.py +++ b/python/pyspark/pandas/tests/indexes/test_indexing_iloc.py @@ -22,7 +22,6 @@ from pyspark.loose_version import LooseVersion from pyspark.pandas.exceptions import SparkPandasIndexingError, SparkPandasNotImplementedError from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexingILocMixin: @@ -287,7 +286,6 @@ def test_iloc_raises(self): class IndexingILocTests( IndexingILocMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_indexing_loc.py b/python/pyspark/pandas/tests/indexes/test_indexing_loc.py index f01362d66860c..b7b109ca81fdc 100644 --- a/python/pyspark/pandas/tests/indexes/test_indexing_loc.py +++ b/python/pyspark/pandas/tests/indexes/test_indexing_loc.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexingLocMixin: @@ -416,7 +415,6 @@ def test_series_loc_setitem(self): class IndexingLocTests( IndexingLocMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_indexing_loc_2d.py b/python/pyspark/pandas/tests/indexes/test_indexing_loc_2d.py index c41190e431be3..aa4f15f664693 100644 --- a/python/pyspark/pandas/tests/indexes/test_indexing_loc_2d.py +++ b/python/pyspark/pandas/tests/indexes/test_indexing_loc_2d.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.pandas.exceptions import SparkPandasIndexingError from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexingLoc2DMixin: @@ -231,7 +230,6 @@ def test_loc2d_duplicated_columns(self): class IndexingLoc2DTests( IndexingLoc2DMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_indexing_loc_multi_idx.py b/python/pyspark/pandas/tests/indexes/test_indexing_loc_multi_idx.py index 494312bccfe7c..e0c5f1ad2221c 100644 --- a/python/pyspark/pandas/tests/indexes/test_indexing_loc_multi_idx.py +++ b/python/pyspark/pandas/tests/indexes/test_indexing_loc_multi_idx.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexingLocMultiIdxMixin: @@ -131,7 +130,6 @@ def test_loc_multiindex(self): class IndexingLocMultiIdxTests( IndexingLocMultiIdxMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_intersection.py b/python/pyspark/pandas/tests/indexes/test_intersection.py index 57e5cfa230619..31c2a818fa36e 100644 --- a/python/pyspark/pandas/tests/indexes/test_intersection.py +++ b/python/pyspark/pandas/tests/indexes/test_intersection.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IntersectionMixin: @@ -149,7 +148,6 @@ def test_intersection(self): class IntersectionTests( IntersectionMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_level.py b/python/pyspark/pandas/tests/indexes/test_level.py index 890e618394cf2..5b72dedcb3ded 100644 --- a/python/pyspark/pandas/tests/indexes/test_level.py +++ b/python/pyspark/pandas/tests/indexes/test_level.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class LevelMixin: @@ -156,7 +155,6 @@ def test_multiindex_equal_levels(self): class LevelTests( LevelMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_missing.py b/python/pyspark/pandas/tests/indexes/test_missing.py index 4eda1369b89e5..2218cdc422f6b 100644 --- a/python/pyspark/pandas/tests/indexes/test_missing.py +++ b/python/pyspark/pandas/tests/indexes/test_missing.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.exceptions import PandasNotImplementedError from pyspark.pandas.missing.indexes import ( MissingPandasLikeDatetimeIndex, @@ -226,7 +225,6 @@ def test_multi_index_not_supported(self): class MissingTests( MissingMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_monotonic.py b/python/pyspark/pandas/tests/indexes/test_monotonic.py index 46e6cb38311e3..6df75d9a6a545 100644 --- a/python/pyspark/pandas/tests/indexes/test_monotonic.py +++ b/python/pyspark/pandas/tests/indexes/test_monotonic.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class MonotonicMixin: @@ -166,7 +165,6 @@ def test_monotonic(self): class MonotonicTests( MonotonicMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_name.py b/python/pyspark/pandas/tests/indexes/test_name.py index b4006d2bb80df..fd6e98779ac27 100644 --- a/python/pyspark/pandas/tests/indexes/test_name.py +++ b/python/pyspark/pandas/tests/indexes/test_name.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas.exceptions import PandasNotImplementedError from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class IndexNameMixin: @@ -158,7 +157,6 @@ def test_multiindex_tuple_column_name(self): class IndexNameTests( IndexNameMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_reindex.py b/python/pyspark/pandas/tests/indexes/test_reindex.py index c767963a83f3e..cb39e18b467d1 100644 --- a/python/pyspark/pandas/tests/indexes/test_reindex.py +++ b/python/pyspark/pandas/tests/indexes/test_reindex.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameReindexMixin: @@ -280,7 +279,6 @@ def test_reindex_like(self): class FrameReindexTests( FrameReindexMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_rename.py b/python/pyspark/pandas/tests/indexes/test_rename.py index 7b86cf0eb1f6a..74f477319508b 100644 --- a/python/pyspark/pandas/tests/indexes/test_rename.py +++ b/python/pyspark/pandas/tests/indexes/test_rename.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class FrameRenameMixin: @@ -300,7 +299,6 @@ def test_index_rename(self): class FrameRenameTests( FrameRenameMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_repeat.py b/python/pyspark/pandas/tests/indexes/test_repeat.py index a873448a9dd06..2316f322974d0 100644 --- a/python/pyspark/pandas/tests/indexes/test_repeat.py +++ b/python/pyspark/pandas/tests/indexes/test_repeat.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class RepeatMixin: @@ -47,7 +46,6 @@ def test_repeat(self): class RepeatTests( RepeatMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_reset_index.py b/python/pyspark/pandas/tests/indexes/test_reset_index.py index 534995ddc3538..ed7dc49ac17b3 100644 --- a/python/pyspark/pandas/tests/indexes/test_reset_index.py +++ b/python/pyspark/pandas/tests/indexes/test_reset_index.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.testing import assert_frame_equal, assert_index_equal, assert_series_equal @@ -147,7 +146,6 @@ def check(psdf, pdf): class FrameResetIndexTests( FrameResetIndexMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_stat.py b/python/pyspark/pandas/tests/indexes/test_stat.py index cef4c11e91fc9..422d791e546eb 100644 --- a/python/pyspark/pandas/tests/indexes/test_stat.py +++ b/python/pyspark/pandas/tests/indexes/test_stat.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class StatMixin: @@ -163,7 +162,6 @@ def test_multiindex_isna(self): class StatTests( StatMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_union.py b/python/pyspark/pandas/tests/indexes/test_union.py index 4e50125c0415d..5201184efb75b 100644 --- a/python/pyspark/pandas/tests/indexes/test_union.py +++ b/python/pyspark/pandas/tests/indexes/test_union.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class UnionMixin: @@ -190,7 +189,6 @@ def test_union(self): class UnionTests( UnionMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/indexes/test_unique.py b/python/pyspark/pandas/tests/indexes/test_unique.py index 5db8fab0ac28f..b04f99c9de78c 100644 --- a/python/pyspark/pandas/tests/indexes/test_unique.py +++ b/python/pyspark/pandas/tests/indexes/test_unique.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class UniqueMixin: @@ -146,7 +145,6 @@ def test_multiindex_has_duplicates(self): class UniqueTests( UniqueMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/io/test_dataframe_conversion.py b/python/pyspark/pandas/tests/io/test_dataframe_conversion.py index 004dbea0951f9..363e8aa6960d5 100644 --- a/python/pyspark/pandas/tests/io/test_dataframe_conversion.py +++ b/python/pyspark/pandas/tests/io/test_dataframe_conversion.py @@ -25,7 +25,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase, TestUtils -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import ( have_openpyxl, openpyxl_requirement_message, @@ -262,7 +261,6 @@ def test_from_records(self): class DataFrameConversionTests( DataFrameConversionMixin, PandasOnSparkTestCase, - SQLTestUtils, TestUtils, ): pass diff --git a/python/pyspark/pandas/tests/io/test_io.py b/python/pyspark/pandas/tests/io/test_io.py index 2a05e11c08969..8931591b8df84 100644 --- a/python/pyspark/pandas/tests/io/test_io.py +++ b/python/pyspark/pandas/tests/io/test_io.py @@ -23,7 +23,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import ( have_jinja2, jinja2_requirement_message, @@ -151,7 +150,6 @@ def test_info(self): class FrameIOTests( FrameIOMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/io/test_series_conversion.py b/python/pyspark/pandas/tests/io/test_series_conversion.py index 2c1221193f105..1f15b6f12c15b 100644 --- a/python/pyspark/pandas/tests/io/test_series_conversion.py +++ b/python/pyspark/pandas/tests/io/test_series_conversion.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import have_jinja2, jinja2_requirement_message @@ -68,7 +67,6 @@ def test_to_latex(self): class SeriesConversionTests( SeriesConversionTestsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_all_any.py b/python/pyspark/pandas/tests/series/test_all_any.py index d93573b674301..8aeb7e0961edf 100644 --- a/python/pyspark/pandas/tests/series/test_all_any.py +++ b/python/pyspark/pandas/tests/series/test_all_any.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesAllAnyMixin: @@ -83,7 +82,6 @@ def test_any(self): class SeriesAllAnyTests( SeriesAllAnyMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_arg_ops.py b/python/pyspark/pandas/tests/series/test_arg_ops.py index cb234dffe9607..9780296d5f9d3 100644 --- a/python/pyspark/pandas/tests/series/test_arg_ops.py +++ b/python/pyspark/pandas/tests/series/test_arg_ops.py @@ -21,7 +21,6 @@ from pyspark.loose_version import LooseVersion from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesArgOpsMixin: @@ -197,7 +196,6 @@ def test_argmin_argmax(self): class SeriesArgOpsTests( SeriesArgOpsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_as_of.py b/python/pyspark/pandas/tests/series/test_as_of.py index 0aa9013c4abb9..fa722e4e754d5 100644 --- a/python/pyspark/pandas/tests/series/test_as_of.py +++ b/python/pyspark/pandas/tests/series/test_as_of.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesAsOfMixin: @@ -115,7 +114,6 @@ def test_asof(self): class SeriesAsOfTests( SeriesAsOfMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_as_type.py b/python/pyspark/pandas/tests/series/test_as_type.py index dc7a854c4f58c..2b17fbb4a1052 100644 --- a/python/pyspark/pandas/tests/series/test_as_type.py +++ b/python/pyspark/pandas/tests/series/test_as_type.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import is_ansi_mode_test from pyspark.pandas.typedef.typehints import ( extension_dtypes_available, @@ -171,7 +170,6 @@ def _check_extension(self, psser, pser): class SeriesAsTypeTests( SeriesAsTypeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_compute.py b/python/pyspark/pandas/tests/series/test_compute.py index b7af7a593b900..f62aa2f214fe9 100644 --- a/python/pyspark/pandas/tests/series/test_compute.py +++ b/python/pyspark/pandas/tests/series/test_compute.py @@ -22,7 +22,6 @@ from pyspark import pandas as ps from pyspark.errors import PySparkValueError from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesComputeMixin: @@ -603,7 +602,6 @@ def test_at_time(self): class SeriesComputeTests( SeriesComputeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_conversion.py b/python/pyspark/pandas/tests/series/test_conversion.py index 2fa038c48d3fd..1405cac690d8b 100644 --- a/python/pyspark/pandas/tests/series/test_conversion.py +++ b/python/pyspark/pandas/tests/series/test_conversion.py @@ -21,7 +21,6 @@ from pyspark.loose_version import LooseVersion from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import have_tabulate, tabulate_requirement_message @@ -78,7 +77,6 @@ def test_to_markdown(self): class SeriesConversionTests( SeriesConversionMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_cumulative.py b/python/pyspark/pandas/tests/series/test_cumulative.py index f24d38a2d8940..4b4e7d8d387e6 100644 --- a/python/pyspark/pandas/tests/series/test_cumulative.py +++ b/python/pyspark/pandas/tests/series/test_cumulative.py @@ -19,7 +19,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesCumulativeMixin: @@ -120,7 +119,6 @@ def test_cumprod(self): class SeriesCumulativeTests( SeriesCumulativeMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_datetime.py b/python/pyspark/pandas/tests/series/test_datetime.py index 5397f8442cdac..62235d6c162b1 100644 --- a/python/pyspark/pandas/tests/series/test_datetime.py +++ b/python/pyspark/pandas/tests/series/test_datetime.py @@ -24,7 +24,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesDateTimeTestsMixin: @@ -293,7 +292,6 @@ def test_unsupported_type(self): class SeriesDateTimeTests( SeriesDateTimeTestsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_index.py b/python/pyspark/pandas/tests/series/test_index.py index cb15588613652..7506e3cfb92ca 100644 --- a/python/pyspark/pandas/tests/series/test_index.py +++ b/python/pyspark/pandas/tests/series/test_index.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesIndexMixin: @@ -486,7 +485,6 @@ def test_rename_axis(self): class SeriesIndexTests( SeriesIndexMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_missing_data.py b/python/pyspark/pandas/tests/series/test_missing_data.py index 545b52f15b798..73f1c400851a6 100644 --- a/python/pyspark/pandas/tests/series/test_missing_data.py +++ b/python/pyspark/pandas/tests/series/test_missing_data.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesMissingDataMixin: @@ -255,7 +254,6 @@ def test_backfill(self): class SeriesMissingDataTests( SeriesMissingDataMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_series.py b/python/pyspark/pandas/tests/series/test_series.py index d4578bc01a935..c4ee13a240f08 100644 --- a/python/pyspark/pandas/tests/series/test_series.py +++ b/python/pyspark/pandas/tests/series/test_series.py @@ -30,7 +30,6 @@ PandasOnSparkTestCase, SPARK_CONF_ARROW_ENABLED, ) -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.exceptions import PandasNotImplementedError from pyspark.pandas.missing.series import MissingPandasLikeSeries from pyspark.pandas.typedef.typehints import extension_object_dtypes_available @@ -878,7 +877,6 @@ def test_transform(self): class SeriesTests( SeriesTestsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_sort.py b/python/pyspark/pandas/tests/series/test_sort.py index 93a5ef6a0c321..e2ab48f83caaf 100644 --- a/python/pyspark/pandas/tests/series/test_sort.py +++ b/python/pyspark/pandas/tests/series/test_sort.py @@ -20,7 +20,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesSortMixin: @@ -140,7 +139,6 @@ def test_searchsorted(self): class SeriesSortTests( SeriesSortMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_stat.py b/python/pyspark/pandas/tests/series/test_stat.py index 03502c286a741..c169ed1dc507b 100644 --- a/python/pyspark/pandas/tests/series/test_stat.py +++ b/python/pyspark/pandas/tests/series/test_stat.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesStatMixin: @@ -728,7 +727,6 @@ def test_series_stat_fail(self): class SeriesStatTests( SeriesStatMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_string_ops_adv.py b/python/pyspark/pandas/tests/series/test_string_ops_adv.py index 922914ee3dfe7..9835ca1a6e4ea 100644 --- a/python/pyspark/pandas/tests/series/test_string_ops_adv.py +++ b/python/pyspark/pandas/tests/series/test_string_ops_adv.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.loose_version import LooseVersion from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesStringOpsAdvMixin: @@ -236,7 +235,6 @@ def test_string_get_dummies(self): class SeriesStringOpsAdvTests( SeriesStringOpsAdvMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/series/test_string_ops_basic.py b/python/pyspark/pandas/tests/series/test_string_ops_basic.py index e34bdcc22a55d..746ce0f3c48e6 100644 --- a/python/pyspark/pandas/tests/series/test_string_ops_basic.py +++ b/python/pyspark/pandas/tests/series/test_string_ops_basic.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SeriesStringOpsMixin: @@ -170,7 +169,6 @@ def test_string_count(self): class SeriesStringOpsTests( SeriesStringOpsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/test_frame_spark.py b/python/pyspark/pandas/tests/test_frame_spark.py index 8bc9707b0b22a..ea1c840c683d0 100644 --- a/python/pyspark/pandas/tests/test_frame_spark.py +++ b/python/pyspark/pandas/tests/test_frame_spark.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase, TestUtils -from pyspark.testing.sqlutils import SQLTestUtils class SparkFrameMethodsTestsMixin: @@ -143,9 +142,7 @@ def test_local_checkpoint(self): self.assert_eq(psdf, new_psdf) -class SparkFrameMethodsTests( - SparkFrameMethodsTestsMixin, PandasOnSparkTestCase, SQLTestUtils, TestUtils -): +class SparkFrameMethodsTests(SparkFrameMethodsTestsMixin, PandasOnSparkTestCase, TestUtils): pass diff --git a/python/pyspark/pandas/tests/test_indexops_spark.py b/python/pyspark/pandas/tests/test_indexops_spark.py index b1fb4ee61ddfb..70ebbed476831 100644 --- a/python/pyspark/pandas/tests/test_indexops_spark.py +++ b/python/pyspark/pandas/tests/test_indexops_spark.py @@ -21,7 +21,6 @@ from pyspark.sql import functions as F from pyspark import pandas as ps from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class SparkIndexOpsMethodsTestsMixin: @@ -63,9 +62,7 @@ def test_series_apply_negative(self): self.psser.spark.transform(lambda scol: F.col("non-existent")) -class SparkIndexOpsMethodsTests( - SparkIndexOpsMethodsTestsMixin, PandasOnSparkTestCase, SQLTestUtils -): +class SparkIndexOpsMethodsTests(SparkIndexOpsMethodsTestsMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/test_internal.py b/python/pyspark/pandas/tests/test_internal.py index 19735763b2761..b82b89735e6bc 100644 --- a/python/pyspark/pandas/tests/test_internal.py +++ b/python/pyspark/pandas/tests/test_internal.py @@ -25,7 +25,6 @@ ) from pyspark.pandas.utils import spark_column_equals from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class InternalFrameTestsMixin: @@ -134,7 +133,7 @@ def test_attach_distributed_column(self): ) -class InternalFrameTests(InternalFrameTestsMixin, PandasOnSparkTestCase, SQLTestUtils): +class InternalFrameTests(InternalFrameTestsMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/test_namespace.py b/python/pyspark/pandas/tests/test_namespace.py index beb2bab06e0ea..152b2804193ff 100644 --- a/python/pyspark/pandas/tests/test_namespace.py +++ b/python/pyspark/pandas/tests/test_namespace.py @@ -34,7 +34,6 @@ from pyspark.pandas.utils import spark_column_equals from pyspark.pandas.missing.general_functions import MissingPandasLikeGeneralFunctions from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.pandas.testing import assert_frame_equal @@ -734,7 +733,7 @@ def test_missing(self): getattr(ps, name)() -class NamespaceTests(NamespaceTestsMixin, PandasOnSparkTestCase, SQLTestUtils): +class NamespaceTests(NamespaceTestsMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/test_numpy_compat.py b/python/pyspark/pandas/tests/test_numpy_compat.py index b92121f4d6cd2..02386ccbbecf0 100644 --- a/python/pyspark/pandas/tests/test_numpy_compat.py +++ b/python/pyspark/pandas/tests/test_numpy_compat.py @@ -21,7 +21,6 @@ from pyspark import pandas as ps from pyspark.pandas import set_option, reset_option from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils class NumPyCompatTestsMixin: @@ -191,7 +190,6 @@ def test_np_spark_compat_frame(self): class NumPyCompatTests( NumPyCompatTestsMixin, PandasOnSparkTestCase, - SQLTestUtils, ): pass diff --git a/python/pyspark/pandas/tests/test_sql.py b/python/pyspark/pandas/tests/test_sql.py index 243a776bf029c..d2d504a72a042 100644 --- a/python/pyspark/pandas/tests/test_sql.py +++ b/python/pyspark/pandas/tests/test_sql.py @@ -18,7 +18,6 @@ from pyspark import pandas as ps from pyspark.errors import ParseException from pyspark.testing.pandasutils import PandasOnSparkTestCase -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.testing.utils import assertDataFrameEqual @@ -106,7 +105,7 @@ def test_sql_with_pandas_on_spark_objects(self): assertDataFrameEqual(ps.sql("SELECT {tbl.A}, {tbl.B} FROM {tbl}", tbl=psdf), psdf) -class SQLTests(SQLTestsMixin, PandasOnSparkTestCase, SQLTestUtils): +class SQLTests(SQLTestsMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/pandas/tests/test_utils.py b/python/pyspark/pandas/tests/test_utils.py index be86cdbf038f4..85e0f52afe97c 100644 --- a/python/pyspark/pandas/tests/test_utils.py +++ b/python/pyspark/pandas/tests/test_utils.py @@ -30,7 +30,6 @@ _assert_pandas_equal, _assert_pandas_almost_equal, ) -from pyspark.testing.sqlutils import SQLTestUtils from pyspark.errors import PySparkAssertionError some_global_variable = 0 @@ -248,7 +247,7 @@ def lazy_prop(self): return self.some_variable -class UtilsTests(UtilsTestsMixin, PandasOnSparkTestCase, SQLTestUtils): +class UtilsTests(UtilsTestsMixin, PandasOnSparkTestCase): pass diff --git a/python/pyspark/testing/connectutils.py b/python/pyspark/testing/connectutils.py index e73c66c561ee0..bc7125e821d01 100644 --- a/python/pyspark/testing/connectutils.py +++ b/python/pyspark/testing/connectutils.py @@ -226,7 +226,7 @@ def quiet(self): not should_test_connect or is_remote_only(), connect_requirement_message or "Requires JVM access", ) -class ReusedMixedTestCase(ReusedConnectTestCase, SQLTestUtils): +class ReusedMixedTestCase(ReusedConnectTestCase): @classmethod def setUpClass(cls): super().setUpClass()