From 46fe9b14129375ec8e32d8f5710fe4cb20950203 Mon Sep 17 00:00:00 2001 From: Ruifeng Zheng Date: Thu, 21 Dec 2023 10:59:06 +0800 Subject: [PATCH 1/3] init --- dev/sparktestsupport/modules.py | 4 ++-- python/__init__.py | 0 .../test_parity_datetime.py} | 8 +++++--- .../{test_series_datetime.py => series/test_datetime.py} | 8 ++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 python/__init__.py rename python/pyspark/pandas/tests/connect/{test_parity_series_datetime.py => series/test_parity_datetime.py} (85%) rename python/pyspark/pandas/tests/{test_series_datetime.py => series/test_datetime.py} (98%) diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index cbd3b35c0015..d3cc122a2114 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -770,7 +770,7 @@ def __hash__(self): "pyspark.pandas.tests.window.test_groupby_rolling_adv", "pyspark.pandas.tests.window.test_groupby_rolling_count", "pyspark.pandas.tests.test_scalars", - "pyspark.pandas.tests.test_series_datetime", + "pyspark.pandas.tests.series.test_datetime", "pyspark.pandas.tests.series.test_string_ops_adv", "pyspark.pandas.tests.series.test_string_ops_basic", "pyspark.pandas.tests.test_spark_functions", @@ -1046,7 +1046,7 @@ def __hash__(self): "pyspark.pandas.tests.connect.resample.test_parity_on", "pyspark.pandas.tests.connect.resample.test_parity_timezone", "pyspark.pandas.tests.connect.test_parity_scalars", - "pyspark.pandas.tests.connect.test_parity_series_datetime", + "pyspark.pandas.tests.connect.series.test_parity_datetime", "pyspark.pandas.tests.connect.series.test_parity_string_ops_adv", "pyspark.pandas.tests.connect.series.test_parity_string_ops_basic", "pyspark.pandas.tests.connect.test_parity_spark_functions", diff --git a/python/__init__.py b/python/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/python/pyspark/pandas/tests/connect/test_parity_series_datetime.py b/python/pyspark/pandas/tests/connect/series/test_parity_datetime.py similarity index 85% rename from python/pyspark/pandas/tests/connect/test_parity_series_datetime.py rename to python/pyspark/pandas/tests/connect/series/test_parity_datetime.py index 0842558d0e3f..89fa7b8ceef8 100644 --- a/python/pyspark/pandas/tests/connect/test_parity_series_datetime.py +++ b/python/pyspark/pandas/tests/connect/series/test_parity_datetime.py @@ -16,19 +16,21 @@ # import unittest -from pyspark.pandas.tests.test_series_datetime import SeriesDateTimeTestsMixin +from pyspark.pandas.tests.series.test_datetime import SeriesDateTimeTestsMixin from pyspark.testing.connectutils import ReusedConnectTestCase from pyspark.testing.pandasutils import PandasOnSparkTestUtils class SeriesDateTimeParityTests( - SeriesDateTimeTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase + SeriesDateTimeTestsMixin, + PandasOnSparkTestUtils, + ReusedConnectTestCase, ): pass if __name__ == "__main__": - from pyspark.pandas.tests.connect.test_parity_series_datetime import * # noqa: F401 + from pyspark.pandas.tests.connect.series.test_parity_datetime import * # noqa: F401 try: import xmlrunner diff --git a/python/pyspark/pandas/tests/test_series_datetime.py b/python/pyspark/pandas/tests/series/test_datetime.py similarity index 98% rename from python/pyspark/pandas/tests/test_series_datetime.py rename to python/pyspark/pandas/tests/series/test_datetime.py index 89d4b70e0b51..e203da29f497 100644 --- a/python/pyspark/pandas/tests/test_series_datetime.py +++ b/python/pyspark/pandas/tests/series/test_datetime.py @@ -280,12 +280,16 @@ def test_unsupported_type(self): ) -class SeriesDateTimeTests(SeriesDateTimeTestsMixin, PandasOnSparkTestCase, SQLTestUtils): +class SeriesDateTimeTests( + SeriesDateTimeTestsMixin, + PandasOnSparkTestCase, + SQLTestUtils, +): pass if __name__ == "__main__": - from pyspark.pandas.tests.test_series_datetime import * # noqa: F401 + from pyspark.pandas.tests.series.test_datetime import * # noqa: F401 try: import xmlrunner From efde09462ce04710ae21bb0153a9f72a9797a8b6 Mon Sep 17 00:00:00 2001 From: Ruifeng Zheng Date: Thu, 21 Dec 2023 11:02:21 +0800 Subject: [PATCH 2/3] empty From 632f18184c3b9c163016a4ca42aa795a5af05d81 Mon Sep 17 00:00:00 2001 From: Ruifeng Zheng Date: Thu, 21 Dec 2023 12:02:34 +0800 Subject: [PATCH 3/3] fix --- python/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 python/__init__.py diff --git a/python/__init__.py b/python/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000