You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2022/07/28 13:14:21 UTC
[arrow] branch master updated: ARROW-17237: [Release] Restore the installation of python tests dependencies in the python_wheel_unix_test.sh script (#13735)
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 389e610612 ARROW-17237: [Release] Restore the installation of python tests dependencies in the python_wheel_unix_test.sh script (#13735)
389e610612 is described below
commit 389e610612762d68d85d8552192fa645101efecd
Author: Raúl Cumplido <ra...@gmail.com>
AuthorDate: Thu Jul 28 15:14:16 2022 +0200
ARROW-17237: [Release] Restore the installation of python tests dependencies in the python_wheel_unix_test.sh script (#13735)
Authored-by: Krisztián Szűcs <sz...@gmail.com>
Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
ci/scripts/python_wheel_unix_test.sh | 9 ++-------
dev/release/verify-release-candidate.sh | 17 ++++++++++-------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ci/scripts/python_wheel_unix_test.sh b/ci/scripts/python_wheel_unix_test.sh
index 2de76ec835..e0d2b808e2 100755
--- a/ci/scripts/python_wheel_unix_test.sh
+++ b/ci/scripts/python_wheel_unix_test.sh
@@ -86,13 +86,8 @@ import pyarrow.plasma
fi
if [ "${CHECK_UNITTESTS}" == "ON" ]; then
- # Generally, we should install testing dependencies here to install
- # built wheels without testing dependencies. Testing dependencies are
- # installed in ci/docker/python-wheel-manylinux-test.dockerfile to
- # reduce test time.
- #
- # We also need to update dev/tasks/python-wheels/*.yml when we need
- # to add more steps to prepare testing dependencies.
+ # Install testing dependencies
+ pip install -U -r ${source_dir}/python/requirements-wheel-test.txt
# Execute unittest, test dependencies must be installed
python -c 'import pyarrow; pyarrow.create_library_symlinks()'
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index 469950ef7a..55cd332ff4 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -72,7 +72,10 @@ case $# in
;;
esac
+# Note that these point to the current verify-release-candidate.sh directories
+# which is different from the ARROW_SOURCE_DIR set in ensure_source_directory()
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+ARROW_DIR="$(cd "${SOURCE_DIR}/../.." && pwd)"
show_header() {
echo ""
@@ -209,7 +212,7 @@ test_apt() {
fi
;;
esac
- if ! docker run --rm -v "${SOURCE_DIR}"/../..:/arrow:delegated \
+ if ! docker run --rm -v "${ARROW_DIR}":/arrow:delegated \
"${target}" \
/arrow/dev/release/verify-apt.sh \
"${VERSION}" \
@@ -250,7 +253,7 @@ test_yum() {
if ! docker run \
--rm \
--security-opt="seccomp=unconfined" \
- --volume "${SOURCE_DIR}"/../..:/arrow:delegated \
+ --volume "${ARROW_DIR}":/arrow:delegated \
"${target}" \
/arrow/dev/release/verify-yum.sh \
"${VERSION}" \
@@ -267,7 +270,7 @@ test_yum() {
--platform linux/arm64 \
--rm \
--security-opt="seccomp=unconfined" \
- --volume "${SOURCE_DIR}"/../..:/arrow:delegated \
+ --volume "${ARROW_DIR}":/arrow:delegated \
"${target}" \
/arrow/dev/release/verify-yum.sh \
"${VERSION}" \
@@ -893,7 +896,7 @@ ensure_source_directory() {
if [ "${SOURCE_KIND}" = "local" ]; then
# Local arrow repository, testing repositories should be already present
if [ -z "$ARROW_SOURCE_DIR" ]; then
- export ARROW_SOURCE_DIR="$(cd ${SOURCE_DIR}/../.. && pwd)"
+ export ARROW_SOURCE_DIR="${ARROW_DIR}"
fi
echo "Verifying local Arrow checkout at ${ARROW_SOURCE_DIR}"
elif [ "${SOURCE_KIND}" = "git" ]; then
@@ -1011,7 +1014,7 @@ test_linux_wheels() {
CONDA_ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver} maybe_setup_conda || exit 1
VENV_ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver} maybe_setup_virtualenv || continue
pip install pyarrow-${VERSION}-cp${pyver/.}-cp${python/.}-${platform}.whl
- INSTALL_PYARROW=OFF ${ARROW_SOURCE_DIR}/ci/scripts/python_wheel_unix_test.sh ${ARROW_SOURCE_DIR}
+ INSTALL_PYARROW=OFF ${ARROW_DIR}/ci/scripts/python_wheel_unix_test.sh ${ARROW_SOURCE_DIR}
done
done
}
@@ -1046,7 +1049,7 @@ test_macos_wheels() {
pip install pyarrow-${VERSION}-cp${pyver/.}-cp${python/.}-${platform}.whl
INSTALL_PYARROW=OFF ARROW_FLIGHT=${check_flight} ARROW_GCS=${check_gcs} ARROW_S3=${check_s3} \
- ${ARROW_SOURCE_DIR}/ci/scripts/python_wheel_unix_test.sh ${ARROW_SOURCE_DIR}
+ ${ARROW_DIR}/ci/scripts/python_wheel_unix_test.sh ${ARROW_SOURCE_DIR}
done
done
@@ -1064,7 +1067,7 @@ test_macos_wheels() {
pip install pyarrow-${VERSION}-cp${pyver/.}-cp${pyver/.}-macosx_11_0_universal2.whl
# check the imports and execute the unittests
INSTALL_PYARROW=OFF ARROW_FLIGHT=${check_flight} \
- arch -${arch} ${ARROW_SOURCE_DIR}/ci/scripts/python_wheel_unix_test.sh ${ARROW_SOURCE_DIR}
+ arch -${arch} ${ARROW_DIR}/ci/scripts/python_wheel_unix_test.sh ${ARROW_SOURCE_DIR}
done
done
fi