This is an automated email from the ASF dual-hosted git repository.
zhengruifeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 369d5027a666 [SPARK-56863][PYTHON][PS][TESTS] Drop redundant
`SQLTestUtils`
369d5027a666 is described below
commit 369d5027a6665d9733a6612f57d07fba59a3ab68
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Tue May 19 08:55:55 2026 +0800
[SPARK-56863][PYTHON][PS][TESTS] Drop redundant `SQLTestUtils`
### What changes were proposed in this pull request?
Drop the redundant `SQLTestUtils` mixin from Python test classes whose
primary base already chains to `SQLTestUtils`. Two cleanups in this PR.
**1. `ReusedMixedTestCase` (`python/pyspark/testing/connectutils.py`)**
```diff
-class ReusedMixedTestCase(ReusedConnectTestCase, SQLTestUtils):
+class ReusedMixedTestCase(ReusedConnectTestCase):
```
Its parent `ReusedConnectTestCase` already mixes in `SQLTestUtils`:
```python
class ReusedConnectTestCase(PySparkBaseTestCase, SQLTestUtils,
PySparkErrorTestUtils):
```
The `from pyspark.testing.sqlutils import SQLTestUtils` import is kept
because `ReusedConnectTestCase` (still in the same file) uses it.
**2. 139 `PandasOnSparkTestCase`-based classes under
`python/pyspark/pandas/tests/`**
`PandasOnSparkTestCase` already chains to `SQLTestUtils`:
```
PandasOnSparkTestCase -> ReusedSQLTestCase -> SQLTestUtils
```
so explicitly mixing `SQLTestUtils` in again on top of
`PandasOnSparkTestCase` (and an `XxxMixin` body trait) is dead weight. This PR
drops the redundant `SQLTestUtils` mixin -- and the now-unused `from
pyspark.testing.sqlutils import SQLTestUtils` import -- from 139 test classes
following the pattern:
```python
class FooTests(
FooTestsMixin,
PandasOnSparkTestCase,
SQLTestUtils, # <-- redundant
):
pass
```
The MRO, inherited helper methods (`sql_conf`, `table`, `temp_view`, ...),
and `unittest.TestCase` subclass relationship are all unchanged after the drop.
Verified across a representative sample (`ReusedMixedTestCase`,
`NamespaceTests`, `NumPyCompatTests`, `UnionTests`, `SparkFrameMethodsTests`):
| class | is `TestCase` | inherits `SQLTestUtils` | `sql_conf` resolves |
| --- | --- | --- | --- |
| ReusedMixedTestCase | ✓ | ✓ | ✓ |
| NamespaceTests | ✓ | ✓ | ✓ |
| NumPyCompatTests | ✓ | ✓ | ✓ |
| UnionTests | ✓ | ✓ | ✓ |
| SparkFrameMethodsTests | ✓ | ✓ | ✓ |
Classes elsewhere that legitimately use `SQLTestUtils` as their main
`TestCase`-adjacent base (e.g. `QueryExecutionListenerTests` in
`python/pyspark/sql/tests/test_listener.py`, which mixes `unittest.TestCase`
and `SQLTestUtils` directly) are not touched.
### Why are the changes needed?
Cleanup -- same spirit as the recently merged [SPARK-56841][SQL][TESTS]
(`Drop redundant BeforeAndAfterEach and SharedSparkSession mixins`) but on the
Python side.
### Does this PR introduce _any_ user-facing change?
No. Test-infra-only change.
### How was this patch tested?
Existing tests. MRO / `issubclass` / inherited-method checks (above)
confirm the behavior of affected classes is unchanged. `py_compile` over a
sample of the edited files succeeds.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude opus-4-7
Closes #55875 from zhengruifeng/drop-sqltestutils-reusedmixed.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
---
python/pyspark/pandas/tests/computation/test_any_all.py | 2 --
python/pyspark/pandas/tests/computation/test_apply_func.py | 2 --
python/pyspark/pandas/tests/computation/test_binary_ops.py | 2 --
python/pyspark/pandas/tests/computation/test_combine.py | 2 --
python/pyspark/pandas/tests/computation/test_compute.py | 2 --
python/pyspark/pandas/tests/computation/test_corr.py | 2 --
python/pyspark/pandas/tests/computation/test_corrwith.py | 2 --
python/pyspark/pandas/tests/computation/test_cov.py | 2 --
python/pyspark/pandas/tests/computation/test_cumulative.py | 2 --
python/pyspark/pandas/tests/computation/test_describe.py | 2 --
python/pyspark/pandas/tests/computation/test_eval.py | 2 --
python/pyspark/pandas/tests/computation/test_idxmax_idxmin.py | 2 --
python/pyspark/pandas/tests/computation/test_melt.py | 2 --
python/pyspark/pandas/tests/computation/test_missing_data.py | 2 --
python/pyspark/pandas/tests/computation/test_pivot.py | 2 --
python/pyspark/pandas/tests/computation/test_pivot_table.py | 2 --
python/pyspark/pandas/tests/computation/test_pivot_table_adv.py | 2 --
.../pyspark/pandas/tests/computation/test_pivot_table_multi_idx.py | 2 --
.../pandas/tests/computation/test_pivot_table_multi_idx_adv.py | 2 --
python/pyspark/pandas/tests/computation/test_stats.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_align.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_chain.py | 2 --
.../pandas/tests/diff_frames_ops/test_arithmetic_chain_ext.py | 2 --
.../pandas/tests/diff_frames_ops/test_arithmetic_chain_ext_float.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_arithmetic_ext.py | 2 --
.../pandas/tests/diff_frames_ops/test_arithmetic_ext_float.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_assign_frame.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_assign_series.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_basic.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_basic_slow.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_bitwise.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_combine_first.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_compare_series.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_concat_inner.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_concat_outer.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_corrwith.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_cov.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_dot_frame.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_dot_series.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_error.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby.py | 2 --
.../pyspark/pandas/tests/diff_frames_ops/test_groupby_aggregate.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_apply.py | 2 --
.../pyspark/pandas/tests/diff_frames_ops/test_groupby_cumulative.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_diff_len.py | 2 --
.../pyspark/pandas/tests/diff_frames_ops/test_groupby_expanding.py | 2 --
.../pandas/tests/diff_frames_ops/test_groupby_expanding_adv.py | 2 --
.../pandas/tests/diff_frames_ops/test_groupby_expanding_count.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_fillna.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_filter.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling.py | 2 --
.../pyspark/pandas/tests/diff_frames_ops/test_groupby_rolling_adv.py | 2 --
.../pandas/tests/diff_frames_ops/test_groupby_rolling_count.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_groupby_shift.py | 2 --
.../pandas/tests/diff_frames_ops/test_groupby_split_apply_combine.py | 2 --
.../pyspark/pandas/tests/diff_frames_ops/test_groupby_transform.py | 2 --
python/pyspark/pandas/tests/diff_frames_ops/test_index.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_series.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_setitem_frame.py | 3 +--
python/pyspark/pandas/tests/diff_frames_ops/test_setitem_series.py | 5 +----
python/pyspark/pandas/tests/frame/test_attrs.py | 2 --
python/pyspark/pandas/tests/frame/test_axis.py | 2 --
python/pyspark/pandas/tests/frame/test_constructor.py | 2 --
python/pyspark/pandas/tests/frame/test_conversion.py | 2 --
python/pyspark/pandas/tests/frame/test_reindexing.py | 2 --
python/pyspark/pandas/tests/frame/test_reshaping.py | 2 --
python/pyspark/pandas/tests/frame/test_spark.py | 2 --
python/pyspark/pandas/tests/frame/test_take.py | 2 --
python/pyspark/pandas/tests/frame/test_take_adv.py | 2 --
python/pyspark/pandas/tests/frame/test_time_series.py | 2 --
python/pyspark/pandas/tests/frame/test_truncate.py | 3 +--
python/pyspark/pandas/tests/groupby/test_aggregate.py | 2 --
python/pyspark/pandas/tests/groupby/test_apply_func.py | 2 --
python/pyspark/pandas/tests/groupby/test_corr.py | 2 --
python/pyspark/pandas/tests/groupby/test_cov.py | 2 --
python/pyspark/pandas/tests/groupby/test_cumulative.py | 2 --
python/pyspark/pandas/tests/groupby/test_describe.py | 2 --
python/pyspark/pandas/tests/groupby/test_head_tail.py | 2 --
python/pyspark/pandas/tests/groupby/test_index.py | 2 --
python/pyspark/pandas/tests/groupby/test_missing_data.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_count.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_first.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_last.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_min_max.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_skew.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_std.py | 2 --
python/pyspark/pandas/tests/groupby/test_split_apply_var.py | 2 --
python/pyspark/pandas/tests/groupby/test_stat.py | 2 --
python/pyspark/pandas/tests/groupby/test_stat_adv.py | 2 --
python/pyspark/pandas/tests/indexes/test_align.py | 2 --
python/pyspark/pandas/tests/indexes/test_append.py | 2 --
python/pyspark/pandas/tests/indexes/test_conversion.py | 2 --
python/pyspark/pandas/tests/indexes/test_getattr.py | 2 --
python/pyspark/pandas/tests/indexes/test_indexing.py | 2 --
python/pyspark/pandas/tests/indexes/test_indexing_adv.py | 2 --
python/pyspark/pandas/tests/indexes/test_indexing_iloc.py | 2 --
python/pyspark/pandas/tests/indexes/test_indexing_loc.py | 2 --
python/pyspark/pandas/tests/indexes/test_indexing_loc_2d.py | 2 --
python/pyspark/pandas/tests/indexes/test_indexing_loc_multi_idx.py | 2 --
python/pyspark/pandas/tests/indexes/test_intersection.py | 2 --
python/pyspark/pandas/tests/indexes/test_level.py | 2 --
python/pyspark/pandas/tests/indexes/test_missing.py | 2 --
python/pyspark/pandas/tests/indexes/test_monotonic.py | 2 --
python/pyspark/pandas/tests/indexes/test_name.py | 2 --
python/pyspark/pandas/tests/indexes/test_reindex.py | 2 --
python/pyspark/pandas/tests/indexes/test_rename.py | 2 --
python/pyspark/pandas/tests/indexes/test_repeat.py | 2 --
python/pyspark/pandas/tests/indexes/test_reset_index.py | 2 --
python/pyspark/pandas/tests/indexes/test_stat.py | 2 --
python/pyspark/pandas/tests/indexes/test_union.py | 2 --
python/pyspark/pandas/tests/indexes/test_unique.py | 2 --
python/pyspark/pandas/tests/io/test_dataframe_conversion.py | 2 --
python/pyspark/pandas/tests/io/test_io.py | 2 --
python/pyspark/pandas/tests/io/test_series_conversion.py | 2 --
python/pyspark/pandas/tests/series/test_all_any.py | 2 --
python/pyspark/pandas/tests/series/test_arg_ops.py | 2 --
python/pyspark/pandas/tests/series/test_as_of.py | 2 --
python/pyspark/pandas/tests/series/test_as_type.py | 2 --
python/pyspark/pandas/tests/series/test_compute.py | 2 --
python/pyspark/pandas/tests/series/test_conversion.py | 2 --
python/pyspark/pandas/tests/series/test_cumulative.py | 2 --
python/pyspark/pandas/tests/series/test_datetime.py | 2 --
python/pyspark/pandas/tests/series/test_index.py | 2 --
python/pyspark/pandas/tests/series/test_missing_data.py | 2 --
python/pyspark/pandas/tests/series/test_series.py | 2 --
python/pyspark/pandas/tests/series/test_sort.py | 2 --
python/pyspark/pandas/tests/series/test_stat.py | 2 --
python/pyspark/pandas/tests/series/test_string_ops_adv.py | 2 --
python/pyspark/pandas/tests/series/test_string_ops_basic.py | 2 --
python/pyspark/pandas/tests/test_frame_spark.py | 5 +----
python/pyspark/pandas/tests/test_indexops_spark.py | 5 +----
python/pyspark/pandas/tests/test_internal.py | 3 +--
python/pyspark/pandas/tests/test_namespace.py | 3 +--
python/pyspark/pandas/tests/test_numpy_compat.py | 2 --
python/pyspark/pandas/tests/test_sql.py | 3 +--
python/pyspark/pandas/tests/test_utils.py | 3 +--
python/pyspark/testing/connectutils.py | 2 +-
140 files changed, 16 insertions(+), 285 deletions(-)
diff --git a/python/pyspark/pandas/tests/computation/test_any_all.py
b/python/pyspark/pandas/tests/computation/test_any_all.py
index 418d78c0d313..ce5fab8e4b5f 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameAnyAllMixin:
@@ -263,7 +262,6 @@ class FrameAnyAllMixin:
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 7ff75d613a8f..9d589b41f584 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 import pandas as ps
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 @@ class FrameApplyFunctionMixin:
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 b0e83c02305c..50e7518ba7a2 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 @@ import pandas as pd
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 @@ class FrameBinaryOpsMixin:
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 b94e49cfa1a6..c55a7a3cbb4c 100644
--- a/python/pyspark/pandas/tests/computation/test_combine.py
+++ b/python/pyspark/pandas/tests/computation/test_combine.py
@@ -20,7 +20,6 @@ import pandas as pd
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 @@ class FrameCombineMixin:
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 da217e6f51e5..4538509cd4d3 100644
--- a/python/pyspark/pandas/tests/computation/test_compute.py
+++ b/python/pyspark/pandas/tests/computation/test_compute.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class FrameComputeMixin:
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 39306b39f0b1..6b3ab85f3fd1 100644
--- a/python/pyspark/pandas/tests/computation/test_corr.py
+++ b/python/pyspark/pandas/tests/computation/test_corr.py
@@ -20,7 +20,6 @@ import pandas as pd
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 @@ class FrameCorrMixin:
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 24e2b4526809..fe096b6b2380 100644
--- a/python/pyspark/pandas/tests/computation/test_corrwith.py
+++ b/python/pyspark/pandas/tests/computation/test_corrwith.py
@@ -19,7 +19,6 @@ import numpy as np
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameCorrwithMixin:
@@ -66,7 +65,6 @@ class FrameCorrwithMixin:
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 90cefc0ff383..5a39c9bded35 100644
--- a/python/pyspark/pandas/tests/computation/test_cov.py
+++ b/python/pyspark/pandas/tests/computation/test_cov.py
@@ -21,7 +21,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameCovMixin:
@@ -102,7 +101,6 @@ class FrameCovMixin:
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 79dc36512cf6..514bf564e915 100644
--- a/python/pyspark/pandas/tests/computation/test_cumulative.py
+++ b/python/pyspark/pandas/tests/computation/test_cumulative.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameCumulativeMixin:
@@ -122,7 +121,6 @@ class FrameCumulativeMixin:
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 3dbff439a664..ad3377b9df60 100644
--- a/python/pyspark/pandas/tests/computation/test_describe.py
+++ b/python/pyspark/pandas/tests/computation/test_describe.py
@@ -22,7 +22,6 @@ import pandas as pd
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 @@ class FrameDescribeMixin:
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 53b7aecef2ec..46bdc11d074f 100644
--- a/python/pyspark/pandas/tests/computation/test_eval.py
+++ b/python/pyspark/pandas/tests/computation/test_eval.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameEvalMixin:
@@ -62,7 +61,6 @@ class FrameEvalMixin:
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 649f3b2104ef..9a3ca66f4ed6 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 @@ import pandas as pd
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 @@ class FrameIdxMaxMinMixin:
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 82d741b5795f..73b0f12836f1 100644
--- a/python/pyspark/pandas/tests/computation/test_melt.py
+++ b/python/pyspark/pandas/tests/computation/test_melt.py
@@ -20,7 +20,6 @@ import pandas as pd
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 @@ class FrameMeltMixin:
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 ae1f68cb9889..75e12cf6978d 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 @@ import pandas as pd
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 @@ class FrameMissingDataMixin:
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 632bb82911c4..75b583beff38 100644
--- a/python/pyspark/pandas/tests/computation/test_pivot.py
+++ b/python/pyspark/pandas/tests/computation/test_pivot.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FramePivotMixin:
@@ -191,7 +190,6 @@ class FramePivotMixin:
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 83c315ecf09b..d347eb2c7580 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class PivotTableMixin:
@@ -75,7 +74,6 @@ class PivotTableMixin:
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 ec8cc8088826..ba916fecb657 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class PivotTableAdvMixin:
@@ -75,7 +74,6 @@ class PivotTableAdvMixin:
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 43c79712f3cf..077f790f7d2b 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class PivotTableMultiIdxMixin:
@@ -73,7 +72,6 @@ class PivotTableMultiIdxMixin:
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 7503f2daeba3..1b3b9634a0bf 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class PivotTableMultiIdxAdvMixin:
@@ -75,7 +74,6 @@ class PivotTableMultiIdxAdvMixin:
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 6a3ce30060a5..f12f28562c23 100644
--- a/python/pyspark/pandas/tests/computation/test_stats.py
+++ b/python/pyspark/pandas/tests/computation/test_stats.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class StatsTestsMixin:
@@ -313,7 +312,6 @@ class StatsTestsMixin:
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 e419af429dbd..f09f54d8579b 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 @@ import pandas as pd
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 @@ class DiffFramesAlignMixin:
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 09fc43d59646..2b483c35ff8b 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 @@ import pandas as pd
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 @@ class ArithmeticMixin(ArithmeticTestingFuncMixin):
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 876c95ed5f5b..338bbe2dac82 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 @@ import pandas as pd
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 @@ class ArithmeticChainMixin(ArithmeticChainTestingFuncMixin):
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 eb96147e1ea1..a64458f3e662 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 @@ import pandas as pd
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 @@ class
ArithmeticChainExtMixin(ArithmeticChainTestingFuncMixin):
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 5e3664fdf061..e3feb5d81ebd 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 @@ import pandas as pd
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 @@ class
ArithmeticChainExtFloatMixin(ArithmeticChainTestingFuncMixin):
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 ef796c4943d2..091e0280976a 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 @@ import pandas as pd
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 @@ class ArithmeticExtMixin(ArithmeticMixin):
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 1c412e4260df..a761b47bb01f 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 @@ import pandas as pd
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 @@ class ArithmeticExtFloatMixin(ArithmeticMixin):
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 823e127a23de..794069980024 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 @@ import pandas as pd
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 @@ class AssignFrameMixin:
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 caf9f67b2d8f..2eb3f7274d62 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 @@ import pandas as pd
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 @@ class AssignSeriesMixin:
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 3b6b95b00e13..79d471620f2c 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 @@ import pandas as pd
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 @@ class BasicMixin:
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 0e545f0d182d..da3e8754e1d8 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 @@ import numpy as np
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 @@ class DiffFramesBasicSlowMixin:
)
-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 30c52cf9aa97..564bf9e19544 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 @@ import pandas as pd
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 @@ class BitwiseMixin:
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 853242422066..da16d8fa6b06 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 @@ import pandas as pd
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 @@ class CombineFirstMixin:
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 1ee9fbab55f9..dc8cb8398c48 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 @@ import pandas as pd
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 @@ class CompareSeriesMixin:
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 7ff9c24c2a47..1fe2f37b544e 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 @@ import pandas as pd
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 @@ class ConcatInnerMixin(ConcatTestingFuncMixin):
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 681a29b3619a..42e0ded722c8 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 @@ import pandas as pd
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 @@ class ConcatOuterMixin(ConcatTestingFuncMixin):
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 acfe014dee01..5e0f0f8be4a9 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 @@ import numpy as np
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 @@ class DiffFramesCorrWithMixin:
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 d4b8f6de1350..0e22ed07c41e 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 @@ import pandas as pd
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 @@ class DiffFramesCovMixin:
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 65452a018d43..a3fea0ae8e66 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 @@ import pandas as pd
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 @@ class DiffFramesDotFrameMixin:
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 40956309e16a..80504da2ecca 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 @@ import pandas as pd
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 @@ class DiffFramesDotSeriesMixin:
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 f5882ca04c0c..1476ac48538d 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 @@ import numpy as np
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 @@ class DiffFramesErrorMixin:
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 b6dddaeee16f..1d89adf4667c 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 @@ import pandas as pd
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 @@ class GroupByMixin:
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 c186c9f15fbe..3b60a4aa1695 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 @@ import pandas as pd
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 @@ class GroupByAggregateMixin:
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 552580b0ceed..179748c4872e 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 @@ import pandas as pd
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 @@ class GroupByApplyMixin:
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 32ef1bd41627..bedc4594a4d5 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 @@ import pandas as pd
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 @@ class GroupByCumulativeMixin:
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 18084d8176ff..48423f81d2b2 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 @@ import pandas as pd
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 @@ class GroupByDiffMixin:
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 25a2dbb37db0..74efe92ceef9 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 import pandas as ps
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 @@ class GroupByDiffLenMixin:
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 d9e6fac4463c..76c95f3f1e48 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 @@ import pandas as pd
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 @@ class GroupByExpandingMixin(GroupByExpandingTestingFuncMixin):
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 f3a04dc70f33..1bd73738bd38 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 @@ class
GroupByExpandingAdvMixin(GroupByExpandingTestingFuncMixin):
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 ba564d9c1096..393acd6993dd 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 @@ class
GroupByExpandingCountMixin(GroupByExpandingTestingFuncMixin):
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 8e2617218904..c61d213e6f84 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 import pandas as ps
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 @@ class GroupByFillNAMixin:
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 e59c95e82a16..149d6170eb75 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 @@ import pandas as pd
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 @@ class GroupByFilterMixin:
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 33919dcea540..4e57a53be00d 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 @@ import pandas as pd
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 @@ class GroupByRollingMixin(GroupByRollingTestingFuncMixin):
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 be9afd07ce7b..e7d6a4988a1f 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 @@ class GroupByRollingAdvMixin(GroupByRollingTestingFuncMixin):
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 f247ba3a12d6..8cb04ff8b944 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 @@ import pandas as pd
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 @@ class GroupByRollingCountMixin:
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 cdf31212d859..45006258ce81 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 @@ import pandas as pd
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 @@ class GroupByShiftMixin:
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 623480c31cc2..5f36bd1ac88b 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 @@ import pandas as pd
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 @@ class GroupBySACMixin:
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 322cadd8ac6c..04bf25338f8d 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 @@ import pandas as pd
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 @@ class GroupByTransformMixin:
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 0d3c4314fbfe..8056bc39504c 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 @@ import pandas as pd
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 @@ class DiffFramesIndexMixin:
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 0b3c16aae1a2..57a9f967c202 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 @@ import numpy as np
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 @@ class DiffFramesSeriesMixin:
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 45eb8a3705f2..eeb8000d00e5 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 import pandas as ps
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 @@ class DiffFramesSetItemFrameMixin:
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 021684d53994..ef8facd04634 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 @@ import pandas as pd
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 @@ class DiffFramesSetItemSeriesMixin:
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 c332134e04c7..4ca2b5aa61c9 100644
--- a/python/pyspark/pandas/tests/frame/test_attrs.py
+++ b/python/pyspark/pandas/tests/frame/test_attrs.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class FrameAttrsMixin:
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 3437d91c8fef..478114e750f6 100644
--- a/python/pyspark/pandas/tests/frame/test_axis.py
+++ b/python/pyspark/pandas/tests/frame/test_axis.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameAxisMixin:
@@ -121,7 +120,6 @@ class FrameAxisMixin:
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 4e6c561f920b..0c80d2bbb795 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.typedef.typehints import (
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 @@ class FrameConstructorMixin:
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 996c7edd5d5b..a891806e6c05 100644
--- a/python/pyspark/pandas/tests/frame/test_conversion.py
+++ b/python/pyspark/pandas/tests/frame/test_conversion.py
@@ -20,7 +20,6 @@ import pandas as pd
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 @@ class FrameConversionMixin:
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 3e170ad2f449..a92329472501 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.errors import PySparkValueError
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 @@ class FrameReindexingMixin:
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 b5cf7c011f46..d5d40dbf3d54 100644
--- a/python/pyspark/pandas/tests/frame/test_reshaping.py
+++ b/python/pyspark/pandas/tests/frame/test_reshaping.py
@@ -22,7 +22,6 @@ import pandas as pd
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 @@ class FrameReshapingMixin:
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 7d83d7e3f411..58a1c2d478af 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.frame import CachedDataFrame
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 @@ class FrameSparkMixin:
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 bcaac5218a6d..5408f1aeaaf2 100644
--- a/python/pyspark/pandas/tests/frame/test_take.py
+++ b/python/pyspark/pandas/tests/frame/test_take.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameTakeMixin:
@@ -75,7 +74,6 @@ class FrameTakeMixin:
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 21f7c7180cbd..d618cbfade2f 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameTakeAdvMixin:
@@ -86,7 +85,6 @@ class FrameTakeAdvMixin:
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 9fe4b39073b9..47046ae45937 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 @@ import pandas as pd
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 @@ class FrameTimeSeriesMixin:
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 b372791c70b8..b57aceb7a18d 100644
--- a/python/pyspark/pandas/tests/frame/test_truncate.py
+++ b/python/pyspark/pandas/tests/frame/test_truncate.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameTruncateMixin:
@@ -116,7 +115,7 @@ class FrameTruncateMixin:
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 5dd87e47aa71..478a5a390ee9 100644
--- a/python/pyspark/pandas/tests/groupby/test_aggregate.py
+++ b/python/pyspark/pandas/tests/groupby/test_aggregate.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class GroupbyAggregateMixin:
@@ -272,7 +271,6 @@ class GroupbyAggregateMixin:
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 c8e2bf41b62e..84ec87e057f3 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 import pandas as ps
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 @@ class GroupbyApplyFuncMixin:
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 da07f98528fa..006ad0eccbfc 100644
--- a/python/pyspark/pandas/tests/groupby/test_corr.py
+++ b/python/pyspark/pandas/tests/groupby/test_corr.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class CorrMixin:
@@ -66,7 +65,6 @@ class CorrMixin:
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 849e469b0500..0845247055ca 100644
--- a/python/pyspark/pandas/tests/groupby/test_cov.py
+++ b/python/pyspark/pandas/tests/groupby/test_cov.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class CovMixin:
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 665153fe0768..c40b91e0d4a5 100644
--- a/python/pyspark/pandas/tests/groupby/test_cumulative.py
+++ b/python/pyspark/pandas/tests/groupby/test_cumulative.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class GroupbyCumulativeMixin:
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 026ca8466bca..e255c62389c8 100644
--- a/python/pyspark/pandas/tests/groupby/test_describe.py
+++ b/python/pyspark/pandas/tests/groupby/test_describe.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class GroupbyDescribeMixin:
@@ -186,7 +185,6 @@ class GroupbyDescribeMixin:
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 fb81891f54c1..7fdd1db906a1 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class GroupbyHeadTailMixin:
@@ -204,7 +203,6 @@ class GroupbyHeadTailMixin:
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 f43fd9549fb5..e4f9902952a4 100644
--- a/python/pyspark/pandas/tests/groupby/test_index.py
+++ b/python/pyspark/pandas/tests/groupby/test_index.py
@@ -20,7 +20,6 @@ import pandas as pd
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 @@ class GroupbyIndexMixin:
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 c7f653638083..e302b9ab334b 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 @@ import pandas as pd
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 @@ class GroupbyMissingDataMixin:
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 73018716e313..27835788e762 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class GroupbySplitApplyTestingFuncMixin:
@@ -169,7 +168,6 @@ class
GroupbySplitApplyMixin(GroupbySplitApplyTestingFuncMixin):
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 7c377bcc9184..a8e026450c46 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 @@ class
GroupbySplitApplyCountMixin(GroupbySplitApplyTestingFuncMixin):
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 ddb1eeaa8bcc..8e8637b01deb 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 @@ class
GroupbySplitApplyFirstMixin(GroupbySplitApplyTestingFuncMixin):
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 a42801b63784..4657b332e1db 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 @@ class
GroupbySplitApplyLastMixin(GroupbySplitApplyTestingFuncMixin):
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 8ab15a228bc5..513993e355ab 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 @@ class
GroupbySplitApplyMMMixin(GroupbySplitApplyTestingFuncMixin):
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 cc268f9afeb3..4bc839c66954 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 @@ class
GroupbySplitApplySkewMixin(GroupbySplitApplyTestingFuncMixin):
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 500d15b567f6..1d51c00e2ff9 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 @@ class
GroupbySplitApplyStdMixin(GroupbySplitApplyTestingFuncMixin):
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 eb7866c4e9f0..f6c5c0b9cc70 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 @@ class
GroupbySplitApplyVarMixin(GroupbySplitApplyTestingFuncMixin):
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 02578a71b568..d1f44131db71 100644
--- a/python/pyspark/pandas/tests/groupby/test_stat.py
+++ b/python/pyspark/pandas/tests/groupby/test_stat.py
@@ -22,7 +22,6 @@ import pandas as pd
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 @@ class GroupbyStatMixin(GroupbyStatTestingFuncMixin):
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 58470fdfd9ca..f06645c2a865 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 @@ import pandas as pd
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 @@ class GroupbyStatAdvMixin(GroupbyStatTestingFuncMixin):
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 b0c770084fc4..5802e351bac1 100644
--- a/python/pyspark/pandas/tests/indexes/test_align.py
+++ b/python/pyspark/pandas/tests/indexes/test_align.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameAlignMixin:
@@ -72,7 +71,6 @@ class FrameAlignMixin:
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 be42ad0ef49f..3a59dde5fc67 100644
--- a/python/pyspark/pandas/tests/indexes/test_append.py
+++ b/python/pyspark/pandas/tests/indexes/test_append.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class AppendMixin:
@@ -111,7 +110,6 @@ class AppendMixin:
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 308000884ab5..8146915ae359 100644
--- a/python/pyspark/pandas/tests/indexes/test_conversion.py
+++ b/python/pyspark/pandas/tests/indexes/test_conversion.py
@@ -24,7 +24,6 @@ from pyspark.pandas.utils import (
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 @@ class ConversionMixin:
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 f0c37d031956..8d3604fa0ebd 100644
--- a/python/pyspark/pandas/tests/indexes/test_getattr.py
+++ b/python/pyspark/pandas/tests/indexes/test_getattr.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class IndexGetattrMixin:
@@ -61,7 +60,6 @@ class IndexGetattrMixin:
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 55efc5dc72e9..78975a457d58 100644
--- a/python/pyspark/pandas/tests/indexes/test_indexing.py
+++ b/python/pyspark/pandas/tests/indexes/test_indexing.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class FrameIndexingMixin:
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 90c9d5dbb0ef..426496e0dba0 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 import pandas as ps
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 @@ class IndexingAdvMixin:
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 ce3fc7d30070..8a54ed0069ec 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 import pandas as ps
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 @@ class IndexingILocMixin:
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 f01362d66860..b7b109ca81fd 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 @@ import pandas as pd
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 @@ class IndexingLocMixin:
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 c41190e431be..aa4f15f66469 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 @@ import pandas as pd
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 @@ class IndexingLoc2DMixin:
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 494312bccfe7..e0c5f1ad2221 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class IndexingLocMultiIdxMixin:
@@ -131,7 +130,6 @@ class IndexingLocMultiIdxMixin:
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 57e5cfa23061..31c2a818fa36 100644
--- a/python/pyspark/pandas/tests/indexes/test_intersection.py
+++ b/python/pyspark/pandas/tests/indexes/test_intersection.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class IntersectionMixin:
@@ -149,7 +148,6 @@ class IntersectionMixin:
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 890e618394cf..5b72dedcb3de 100644
--- a/python/pyspark/pandas/tests/indexes/test_level.py
+++ b/python/pyspark/pandas/tests/indexes/test_level.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class LevelMixin:
@@ -156,7 +155,6 @@ class LevelMixin:
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 4eda1369b89e..2218cdc422f6 100644
--- a/python/pyspark/pandas/tests/indexes/test_missing.py
+++ b/python/pyspark/pandas/tests/indexes/test_missing.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class MissingMixin:
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 46e6cb38311e..6df75d9a6a54 100644
--- a/python/pyspark/pandas/tests/indexes/test_monotonic.py
+++ b/python/pyspark/pandas/tests/indexes/test_monotonic.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class MonotonicMixin:
@@ -166,7 +165,6 @@ class MonotonicMixin:
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 b4006d2bb80d..fd6e98779ac2 100644
--- a/python/pyspark/pandas/tests/indexes/test_name.py
+++ b/python/pyspark/pandas/tests/indexes/test_name.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class IndexNameMixin:
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 c767963a83f3..cb39e18b467d 100644
--- a/python/pyspark/pandas/tests/indexes/test_reindex.py
+++ b/python/pyspark/pandas/tests/indexes/test_reindex.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameReindexMixin:
@@ -280,7 +279,6 @@ class FrameReindexMixin:
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 7b86cf0eb1f6..74f477319508 100644
--- a/python/pyspark/pandas/tests/indexes/test_rename.py
+++ b/python/pyspark/pandas/tests/indexes/test_rename.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class FrameRenameMixin:
@@ -300,7 +299,6 @@ class FrameRenameMixin:
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 a873448a9dd0..2316f322974d 100644
--- a/python/pyspark/pandas/tests/indexes/test_repeat.py
+++ b/python/pyspark/pandas/tests/indexes/test_repeat.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class RepeatMixin:
@@ -47,7 +46,6 @@ class RepeatMixin:
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 534995ddc353..ed7dc49ac17b 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 @@ import pandas as pd
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 @@ class FrameResetIndexMixin:
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 cef4c11e91fc..422d791e546e 100644
--- a/python/pyspark/pandas/tests/indexes/test_stat.py
+++ b/python/pyspark/pandas/tests/indexes/test_stat.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class StatMixin:
@@ -163,7 +162,6 @@ class StatMixin:
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 4e50125c0415..5201184efb75 100644
--- a/python/pyspark/pandas/tests/indexes/test_union.py
+++ b/python/pyspark/pandas/tests/indexes/test_union.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class UnionMixin:
@@ -190,7 +189,6 @@ class UnionMixin:
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 5db8fab0ac28..b04f99c9de78 100644
--- a/python/pyspark/pandas/tests/indexes/test_unique.py
+++ b/python/pyspark/pandas/tests/indexes/test_unique.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class UniqueMixin:
@@ -146,7 +145,6 @@ class UniqueMixin:
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 004dbea0951f..363e8aa6960d 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 @@ import pandas as pd
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 @@ class DataFrameConversionMixin:
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 2a05e11c0896..8931591b8df8 100644
--- a/python/pyspark/pandas/tests/io/test_io.py
+++ b/python/pyspark/pandas/tests/io/test_io.py
@@ -23,7 +23,6 @@ import pandas as pd
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 @@ class FrameIOMixin:
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 2c1221193f10..1f15b6f12c15 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 @@ import pandas as pd
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 @@ class SeriesConversionTestsMixin:
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 d93573b67430..8aeb7e0961ed 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class SeriesAllAnyMixin:
@@ -83,7 +82,6 @@ class SeriesAllAnyMixin:
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 cb234dffe960..9780296d5f9d 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 @@ import pandas as pd
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 @@ class SeriesArgOpsMixin:
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 0aa9013c4abb..fa722e4e754d 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 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class SeriesAsOfMixin:
@@ -115,7 +114,6 @@ class SeriesAsOfMixin:
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 dc7a854c4f58..2b17fbb4a105 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 @@ import pandas as pd
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 @@ class SeriesAsTypeMixin:
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 b7af7a593b90..f62aa2f214fe 100644
--- a/python/pyspark/pandas/tests/series/test_compute.py
+++ b/python/pyspark/pandas/tests/series/test_compute.py
@@ -22,7 +22,6 @@ import pandas as pd
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 @@ class SeriesComputeMixin:
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 2fa038c48d3f..1405cac690d8 100644
--- a/python/pyspark/pandas/tests/series/test_conversion.py
+++ b/python/pyspark/pandas/tests/series/test_conversion.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class SeriesConversionMixin:
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 f24d38a2d894..4b4e7d8d387e 100644
--- a/python/pyspark/pandas/tests/series/test_cumulative.py
+++ b/python/pyspark/pandas/tests/series/test_cumulative.py
@@ -19,7 +19,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class SeriesCumulativeMixin:
@@ -120,7 +119,6 @@ class SeriesCumulativeMixin:
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 5397f8442cda..62235d6c162b 100644
--- a/python/pyspark/pandas/tests/series/test_datetime.py
+++ b/python/pyspark/pandas/tests/series/test_datetime.py
@@ -24,7 +24,6 @@ import pandas as pd
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 @@ class SeriesDateTimeTestsMixin:
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 cb1558861365..7506e3cfb92c 100644
--- a/python/pyspark/pandas/tests/series/test_index.py
+++ b/python/pyspark/pandas/tests/series/test_index.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class SeriesIndexMixin:
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 545b52f15b79..73f1c400851a 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 @@ import pandas as pd
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 @@ class SeriesMissingDataMixin:
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 d4578bc01a93..c4ee13a240f0 100644
--- a/python/pyspark/pandas/tests/series/test_series.py
+++ b/python/pyspark/pandas/tests/series/test_series.py
@@ -30,7 +30,6 @@ from pyspark.testing.pandasutils import (
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 @@ class SeriesTestsMixin:
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 93a5ef6a0c32..e2ab48f83caa 100644
--- a/python/pyspark/pandas/tests/series/test_sort.py
+++ b/python/pyspark/pandas/tests/series/test_sort.py
@@ -20,7 +20,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class SeriesSortMixin:
@@ -140,7 +139,6 @@ class SeriesSortMixin:
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 03502c286a74..c169ed1dc507 100644
--- a/python/pyspark/pandas/tests/series/test_stat.py
+++ b/python/pyspark/pandas/tests/series/test_stat.py
@@ -21,7 +21,6 @@ import pandas as pd
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class SeriesStatMixin:
@@ -728,7 +727,6 @@ class SeriesStatMixin:
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 922914ee3dfe..9835ca1a6e4e 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 @@ import re
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 @@ class SeriesStringOpsAdvMixin:
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 e34bdcc22a55..746ce0f3c48e 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 @@ import re
from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase
-from pyspark.testing.sqlutils import SQLTestUtils
class SeriesStringOpsMixin:
@@ -170,7 +169,6 @@ class SeriesStringOpsMixin:
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 8bc9707b0b22..ea1c840c683d 100644
--- a/python/pyspark/pandas/tests/test_frame_spark.py
+++ b/python/pyspark/pandas/tests/test_frame_spark.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class SparkFrameMethodsTestsMixin:
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 b1fb4ee61ddf..70ebbed47683 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.errors import AnalysisException
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 @@ class SparkIndexOpsMethodsTestsMixin:
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 19735763b276..b82b89735e6b 100644
--- a/python/pyspark/pandas/tests/test_internal.py
+++ b/python/pyspark/pandas/tests/test_internal.py
@@ -25,7 +25,6 @@ from pyspark.pandas.internal import (
)
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 @@ class InternalFrameTestsMixin:
)
-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 beb2bab06e0e..152b2804193f 100644
--- a/python/pyspark/pandas/tests/test_namespace.py
+++ b/python/pyspark/pandas/tests/test_namespace.py
@@ -34,7 +34,6 @@ from pyspark.pandas.namespace import _get_index_map,
read_delta
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 @@ class NamespaceTestsMixin:
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 b92121f4d6cd..02386ccbbecf 100644
--- a/python/pyspark/pandas/tests/test_numpy_compat.py
+++ b/python/pyspark/pandas/tests/test_numpy_compat.py
@@ -21,7 +21,6 @@ import pandas as pd
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 @@ class NumPyCompatTestsMixin:
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 243a776bf029..d2d504a72a04 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 @@ class SQLTestsMixin:
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 be86cdbf038f..85e0f52afe97 100644
--- a/python/pyspark/pandas/tests/test_utils.py
+++ b/python/pyspark/pandas/tests/test_utils.py
@@ -30,7 +30,6 @@ from pyspark.testing.pandasutils import (
_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 @@ class TestClassForLazyProp:
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 e73c66c561ee..bc7125e821d0 100644
--- a/python/pyspark/testing/connectutils.py
+++ b/python/pyspark/testing/connectutils.py
@@ -226,7 +226,7 @@ class ReusedConnectTestCase(PySparkBaseTestCase,
SQLTestUtils, PySparkErrorTestU
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()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
