Skip to content

ARROW-18390: [CI][Python] Update spark test modules to match spark master #14715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 25, 2022
Merged

ARROW-18390: [CI][Python] Update spark test modules to match spark master #14715

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6562e07
ARROW-18390: [CI][Python] Remove testing missing module from spark ma…
raulcd Nov 23, 2022
9bb13f6
Fix all the modules based on spark test modules refactoring
raulcd Nov 23, 2022
dde4e85
Add logic to use old modules only for Spark <= 2.x or <= 3.3.x
raulcd Nov 24, 2022
dad621d
Fix conditions
raulcd Nov 24, 2022
72089d5
Fix review comment
raulcd Nov 24, 2022
2a87421
Fix SPARK_VERSION check as suggested on review
raulcd Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions ci/scripts/integration_spark.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spark_version=${SPARK_VERSION:-master}
# Use old behavior that always dropped tiemzones.
export PYARROW_IGNORE_TIMEZONE=1

if [ "${SPARK_VERSION:0:2}" == "2." ]; then
if [ "${SPARK_VERSION:1:2}" == "2." ]; then
# https://github.com/apache/spark/blob/master/docs/sql-pyspark-pandas-with-arrow.md#compatibility-setting-for-pyarrow--0150-and-spark-23x-24x
export ARROW_PRE_0_15_IPC_FORMAT=1
fi
Expand Down Expand Up @@ -73,14 +73,35 @@ pushd ${spark_dir}

# Run pyarrow related Python tests only
spark_python_tests=(
"pyspark.sql.tests.test_arrow"
"pyspark.sql.tests.test_pandas_map"
"pyspark.sql.tests.test_pandas_cogrouped_map"
"pyspark.sql.tests.test_pandas_grouped_map"
"pyspark.sql.tests.test_pandas_udf"
"pyspark.sql.tests.test_pandas_udf_scalar"
"pyspark.sql.tests.test_pandas_udf_grouped_agg"
"pyspark.sql.tests.test_pandas_udf_window")
"pyspark.sql.tests.test_arrow")

case "${SPARK_VERSION}" in
v1.*|v2.*|v3.0.*|v3.1.*|v3.2.*|v3.3.*)
old_test_modules=true
;;
*)
old_test_modules=false
;;
esac
if [ "${old_test_modules}" == "true" ]; then
spark_python_tests+=(
"pyspark.sql.tests.test_pandas_grouped_map"
"pyspark.sql.tests.test_pandas_map"
"pyspark.sql.tests.test_pandas_cogrouped_map"
"pyspark.sql.tests.test_pandas_udf"
"pyspark.sql.tests.test_pandas_udf_scalar"
"pyspark.sql.tests.test_pandas_udf_grouped_agg"
"pyspark.sql.tests.test_pandas_udf_window")
else
spark_python_tests+=(
"pyspark.sql.tests.pandas.test_pandas_grouped_map"
"pyspark.sql.tests.pandas.test_pandas_map"
"pyspark.sql.tests.pandas.test_pandas_cogrouped_map"
"pyspark.sql.tests.pandas.test_pandas_udf"
"pyspark.sql.tests.pandas.test_pandas_udf_scalar"
"pyspark.sql.tests.pandas.test_pandas_udf_grouped_agg"
"pyspark.sql.tests.pandas.test_pandas_udf_window")
fi

(echo "Testing PySpark:"; IFS=$'\n'; echo "${spark_python_tests[*]}")
python/run-tests --testnames "$(IFS=,; echo "${spark_python_tests[*]}")" --python-executables python
Expand Down