This is an automated email from the ASF dual-hosted git repository.
gurwls223 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 d6f61d4e9d5 [SPARK-46280][PS][TESTS] Move test_parity_frame_resample
and test_parity_series_resample to `pyspark.pandas.tests.connect.resample`
d6f61d4e9d5 is described below
commit d6f61d4e9d58c9806e345932482ecafa77c1a405
Author: Ruifeng Zheng <ruife...@apache.org>
AuthorDate: Wed Dec 6 17:24:05 2023 +0900
[SPARK-46280][PS][TESTS] Move test_parity_frame_resample and
test_parity_series_resample to `pyspark.pandas.tests.connect.resample`
### What changes were proposed in this pull request?
Move test_parity_frame_resample and test_parity_series_resample to
`pyspark.pandas.tests.connect.resample`
### Why are the changes needed?
re-org resampling tests, move them to the right place
### Does this PR introduce _any_ user-facing change?
no, test only
### How was this patch tested?
ci
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #44199 from zhengruifeng/ps_test_move_df_resample.
Authored-by: Ruifeng Zheng <ruife...@apache.org>
Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
---
dev/sparktestsupport/modules.py | 8 ++++----
.../test_parity_frame.py} | 8 ++++----
.../test_parity_series.py} | 8 ++++----
.../tests/{test_frame_resample.py => resample/test_frame.py} | 6 +++---
.../tests/{test_series_resample.py => resample/test_series.py} | 6 +++---
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
index d204fcf8295..834b3bd235a 100644
--- a/dev/sparktestsupport/modules.py
+++ b/dev/sparktestsupport/modules.py
@@ -743,10 +743,10 @@ pyspark_pandas = Module(
"pyspark.pandas.tests.test_repr",
"pyspark.pandas.tests.resample.test_on",
"pyspark.pandas.tests.resample.test_error",
+ "pyspark.pandas.tests.resample.test_frame",
"pyspark.pandas.tests.resample.test_missing",
+ "pyspark.pandas.tests.resample.test_series",
"pyspark.pandas.tests.resample.test_timezone",
- "pyspark.pandas.tests.test_frame_resample",
- "pyspark.pandas.tests.test_series_resample",
"pyspark.pandas.tests.test_reshape",
"pyspark.pandas.tests.test_rolling",
"pyspark.pandas.tests.test_scalars",
@@ -1109,8 +1109,8 @@ pyspark_pandas_connect_part2 = Module(
"pyspark.pandas.tests.connect.indexes.test_parity_datetime_property",
"pyspark.pandas.tests.connect.test_parity_frame_interpolate",
"pyspark.pandas.tests.connect.test_parity_series_interpolate",
- "pyspark.pandas.tests.connect.test_parity_frame_resample",
- "pyspark.pandas.tests.connect.test_parity_series_resample",
+ "pyspark.pandas.tests.connect.resample.test_parity_frame",
+ "pyspark.pandas.tests.connect.resample.test_parity_series",
"pyspark.pandas.tests.connect.test_parity_ewm",
"pyspark.pandas.tests.connect.test_parity_rolling",
"pyspark.pandas.tests.connect.test_parity_expanding",
diff --git a/python/pyspark/pandas/tests/connect/test_parity_frame_resample.py
b/python/pyspark/pandas/tests/connect/resample/test_parity_frame.py
similarity index 82%
rename from python/pyspark/pandas/tests/connect/test_parity_frame_resample.py
rename to python/pyspark/pandas/tests/connect/resample/test_parity_frame.py
index b4f4d5aceea..8e12f6be51e 100644
--- a/python/pyspark/pandas/tests/connect/test_parity_frame_resample.py
+++ b/python/pyspark/pandas/tests/connect/resample/test_parity_frame.py
@@ -16,19 +16,19 @@
#
import unittest
-from pyspark.pandas.tests.test_frame_resample import FrameResampleTestsMixin
+from pyspark.pandas.tests.resample.test_frame import ResampleFrameMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils, TestUtils
-class FrameResampleParityTests(
- FrameResampleTestsMixin, PandasOnSparkTestUtils, TestUtils,
ReusedConnectTestCase
+class ResampleParityFrameTests(
+ ResampleFrameMixin, PandasOnSparkTestUtils, TestUtils,
ReusedConnectTestCase
):
pass
if __name__ == "__main__":
- from pyspark.pandas.tests.connect.test_parity_frame_resample import * #
noqa: F401
+ from pyspark.pandas.tests.connect.resample.test_parity_frame import * #
noqa: F401
try:
import xmlrunner # type: ignore[import]
diff --git a/python/pyspark/pandas/tests/connect/test_parity_series_resample.py
b/python/pyspark/pandas/tests/connect/resample/test_parity_series.py
similarity index 81%
rename from python/pyspark/pandas/tests/connect/test_parity_series_resample.py
rename to python/pyspark/pandas/tests/connect/resample/test_parity_series.py
index a05b07c2730..8b92b802a01 100644
--- a/python/pyspark/pandas/tests/connect/test_parity_series_resample.py
+++ b/python/pyspark/pandas/tests/connect/resample/test_parity_series.py
@@ -16,19 +16,19 @@
#
import unittest
-from pyspark.pandas.tests.test_series_resample import SeriesResampleTestsMixin
+from pyspark.pandas.tests.resample.test_series import ResampleSeriesMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils, TestUtils
-class SeriesResampleParityTests(
- SeriesResampleTestsMixin, PandasOnSparkTestUtils, TestUtils,
ReusedConnectTestCase
+class ResampleParitySeriesTests(
+ ResampleSeriesMixin, PandasOnSparkTestUtils, TestUtils,
ReusedConnectTestCase
):
pass
if __name__ == "__main__":
- from pyspark.pandas.tests.connect.test_parity_series_resample import * #
noqa: F401
+ from pyspark.pandas.tests.connect.resample.test_parity_series import * #
noqa: F401
try:
import xmlrunner # type: ignore[import]
diff --git a/python/pyspark/pandas/tests/test_frame_resample.py
b/python/pyspark/pandas/tests/resample/test_frame.py
similarity index 96%
rename from python/pyspark/pandas/tests/test_frame_resample.py
rename to python/pyspark/pandas/tests/resample/test_frame.py
index 1b525b9792c..c3b3423a60a 100644
--- a/python/pyspark/pandas/tests/test_frame_resample.py
+++ b/python/pyspark/pandas/tests/resample/test_frame.py
@@ -26,7 +26,7 @@ from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase, TestUtils
-class FrameResampleTestsMixin:
+class ResampleFrameMixin:
@property
def pdf1(self):
np.random.seed(11)
@@ -135,12 +135,12 @@ class FrameResampleTestsMixin:
self._test_resample(self.pdf6, self.psdf6, ["29S", "10MIN", "3H"],
"left", "right", "var")
-class FrameResampleTests(FrameResampleTestsMixin, PandasOnSparkTestCase,
TestUtils):
+class ResampleFrameTests(ResampleFrameMixin, PandasOnSparkTestCase, TestUtils):
pass
if __name__ == "__main__":
- from pyspark.pandas.tests.test_frame_resample import * # noqa: F401
+ from pyspark.pandas.tests.resample.test_frame import * # noqa: F401
try:
import xmlrunner
diff --git a/python/pyspark/pandas/tests/test_series_resample.py
b/python/pyspark/pandas/tests/resample/test_series.py
similarity index 96%
rename from python/pyspark/pandas/tests/test_series_resample.py
rename to python/pyspark/pandas/tests/resample/test_series.py
index e5de9b206cd..4828ca089e1 100644
--- a/python/pyspark/pandas/tests/test_series_resample.py
+++ b/python/pyspark/pandas/tests/resample/test_series.py
@@ -26,7 +26,7 @@ from pyspark import pandas as ps
from pyspark.testing.pandasutils import PandasOnSparkTestCase, TestUtils
-class SeriesResampleTestsMixin:
+class ResampleSeriesMixin:
@property
def pdf1(self):
np.random.seed(11)
@@ -135,12 +135,12 @@ class SeriesResampleTestsMixin:
self._test_resample(self.pdf6.A, self.psdf6.A, ["111S"], "right",
"right", "std")
-class SeriesResampleTests(SeriesResampleTestsMixin, PandasOnSparkTestCase,
TestUtils):
+class ResampleSeriesTests(ResampleSeriesMixin, PandasOnSparkTestCase,
TestUtils):
pass
if __name__ == "__main__":
- from pyspark.pandas.tests.test_series_resample import * # noqa: F401
+ from pyspark.pandas.tests.resample.test_series import * # noqa: F401
try:
import xmlrunner
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
