From 283a122109c8d3ba31f55df6dd6c015b83bd2ccb Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Fri, 22 Aug 2025 10:16:35 +0900 Subject: [PATCH 1/3] GH-47402: [CI][Dev] Fix shellcheck errors in the ci/scripts/python_test_emscripten.sh --- .pre-commit-config.yaml | 1 + ci/scripts/python_test_emscripten.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa02e1c8e34d..dc938bac3447 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -332,6 +332,7 @@ repos: ?^ci/scripts/python_build\.sh$| ?^ci/scripts/python_sdist_build\.sh$| ?^ci/scripts/python_sdist_test\.sh$| + ?^ci/scripts/python_test_emscripten\.sh$| ?^ci/scripts/python_wheel_unix_test\.sh$| ?^ci/scripts/python_test_type_annotations\.sh$| ?^ci/scripts/python_test\.sh$| diff --git a/ci/scripts/python_test_emscripten.sh b/ci/scripts/python_test_emscripten.sh index 4029722568b9..621ac4bd0d18 100755 --- a/ci/scripts/python_test_emscripten.sh +++ b/ci/scripts/python_test_emscripten.sh @@ -25,14 +25,15 @@ set -ex build_dir=${1}/python pyodide_dist_dir=${2} -cd ${build_dir} +cd "${build_dir}" # note: this uses the newest wheel in dist +# shellcheck disable=SC2012 pyodide_wheel=$(ls -t dist/pyarrow*.whl | head -1) echo "-------------- Running emscripten tests in Node ----------------------" -python scripts/run_emscripten_tests.py ${pyodide_wheel} --dist-dir=${pyodide_dist_dir} --runtime=node +python scripts/run_emscripten_tests.py "${pyodide_wheel}" --dist-dir="${pyodide_dist_dir}" --runtime=node echo "-------------- Running emscripten tests in Chrome --------------------" -python scripts/run_emscripten_tests.py ${pyodide_wheel} --dist-dir=${pyodide_dist_dir} --runtime=chrome +python scripts/run_emscripten_tests.py "${pyodide_wheel}" --dist-dir="${pyodide_dist_dir}" --runtime=chrome From afa879a0a6093f41f2c8e19461a5b949d184d486 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Tue, 26 Aug 2025 15:48:52 +0900 Subject: [PATCH 2/3] Revert "GH-47402: [CI][Dev] Fix shellcheck errors in the ci/scripts/python_test_emscripten.sh" This reverts commit 2e4daa41ccee9b519d8eacbd36e0e713b403be84. --- .pre-commit-config.yaml | 1 - ci/scripts/python_test_emscripten.sh | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dc938bac3447..fa02e1c8e34d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -332,7 +332,6 @@ repos: ?^ci/scripts/python_build\.sh$| ?^ci/scripts/python_sdist_build\.sh$| ?^ci/scripts/python_sdist_test\.sh$| - ?^ci/scripts/python_test_emscripten\.sh$| ?^ci/scripts/python_wheel_unix_test\.sh$| ?^ci/scripts/python_test_type_annotations\.sh$| ?^ci/scripts/python_test\.sh$| diff --git a/ci/scripts/python_test_emscripten.sh b/ci/scripts/python_test_emscripten.sh index 621ac4bd0d18..4029722568b9 100755 --- a/ci/scripts/python_test_emscripten.sh +++ b/ci/scripts/python_test_emscripten.sh @@ -25,15 +25,14 @@ set -ex build_dir=${1}/python pyodide_dist_dir=${2} -cd "${build_dir}" +cd ${build_dir} # note: this uses the newest wheel in dist -# shellcheck disable=SC2012 pyodide_wheel=$(ls -t dist/pyarrow*.whl | head -1) echo "-------------- Running emscripten tests in Node ----------------------" -python scripts/run_emscripten_tests.py "${pyodide_wheel}" --dist-dir="${pyodide_dist_dir}" --runtime=node +python scripts/run_emscripten_tests.py ${pyodide_wheel} --dist-dir=${pyodide_dist_dir} --runtime=node echo "-------------- Running emscripten tests in Chrome --------------------" -python scripts/run_emscripten_tests.py "${pyodide_wheel}" --dist-dir="${pyodide_dist_dir}" --runtime=chrome +python scripts/run_emscripten_tests.py ${pyodide_wheel} --dist-dir=${pyodide_dist_dir} --runtime=chrome From bc5e282047ee1a8e44bd6b430d2be12f647f09c3 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Fri, 22 Aug 2025 10:16:35 +0900 Subject: [PATCH 3/3] GH-47402: [CI][Dev] Fix shellcheck errors in the ci/scripts/python_test_emscripten.sh --- .pre-commit-config.yaml | 1 + ci/scripts/python_test_emscripten.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa02e1c8e34d..dc938bac3447 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -332,6 +332,7 @@ repos: ?^ci/scripts/python_build\.sh$| ?^ci/scripts/python_sdist_build\.sh$| ?^ci/scripts/python_sdist_test\.sh$| + ?^ci/scripts/python_test_emscripten\.sh$| ?^ci/scripts/python_wheel_unix_test\.sh$| ?^ci/scripts/python_test_type_annotations\.sh$| ?^ci/scripts/python_test\.sh$| diff --git a/ci/scripts/python_test_emscripten.sh b/ci/scripts/python_test_emscripten.sh index 4029722568b9..621ac4bd0d18 100755 --- a/ci/scripts/python_test_emscripten.sh +++ b/ci/scripts/python_test_emscripten.sh @@ -25,14 +25,15 @@ set -ex build_dir=${1}/python pyodide_dist_dir=${2} -cd ${build_dir} +cd "${build_dir}" # note: this uses the newest wheel in dist +# shellcheck disable=SC2012 pyodide_wheel=$(ls -t dist/pyarrow*.whl | head -1) echo "-------------- Running emscripten tests in Node ----------------------" -python scripts/run_emscripten_tests.py ${pyodide_wheel} --dist-dir=${pyodide_dist_dir} --runtime=node +python scripts/run_emscripten_tests.py "${pyodide_wheel}" --dist-dir="${pyodide_dist_dir}" --runtime=node echo "-------------- Running emscripten tests in Chrome --------------------" -python scripts/run_emscripten_tests.py ${pyodide_wheel} --dist-dir=${pyodide_dist_dir} --runtime=chrome +python scripts/run_emscripten_tests.py "${pyodide_wheel}" --dist-dir="${pyodide_dist_dir}" --runtime=chrome