This is an automated email from the ASF dual-hosted git repository.
kou 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 9010c8e6e8 ARROW-16428: [Release] Add prefix to ENV variables
9010c8e6e8 is described below
commit 9010c8e6e8034a708533d9aba307152eef5969b1
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Mon May 2 05:39:14 2022 +0900
ARROW-16428: [Release] Add prefix to ENV variables
We should not use ENV as variable name because it's used for sh:
dash(1):
> If the environment variable ENV is set on entry to an interactive
> shell, or is set in the .profile of a login shell, the shell next
> reads commands from the file named in ENV.
Closes #13039 from kou/verify-rc-add-prefix-to-env
Authored-by: Sutou Kouhei <k...@clear-code.com>
Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
dev/release/verify-release-candidate.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 1821a14359..c85978da7b 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -445,7 +445,7 @@ install_conda() {
maybe_setup_conda() {
# Optionally setup conda environment with the passed dependencies
- local env="conda-${ENV:-source}"
+ local env="conda-${CONDA_ENV:-source}"
local pyver=${PYTHON_VERSION:-3}
if [ "${USE_CONDA}" -gt 0 ]; then
@@ -476,7 +476,7 @@ maybe_setup_conda() {
maybe_setup_virtualenv() {
# Optionally setup pip virtualenv with the passed dependencies
- local env="venv-${ENV:-source}"
+ local env="venv-${VENV_ENV:-source}"
local pyver=${PYTHON_VERSION:-3}
local python=${PYTHON:-"python${pyver}"}
local virtualenv="${ARROW_TMPDIR}/${env}"
@@ -982,8 +982,8 @@ test_linux_wheels() {
local pyver=${python/m}
for platform in ${platform_tags}; do
show_header "Testing Python ${pyver} wheel for platform ${platform}"
- ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver} maybe_setup_conda
|| exit 1
- ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver}
maybe_setup_virtualenv || continue
+ VENV_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}
done
@@ -1013,8 +1013,8 @@ test_macos_wheels() {
check_s3=OFF
fi
- ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver} maybe_setup_conda
|| exit 1
- ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver}
maybe_setup_virtualenv || continue
+ VENV_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_FLIGHT=${check_flight} ARROW_S3=${check_s3} \
@@ -1031,7 +1031,7 @@ test_macos_wheels() {
# create and activate a virtualenv for testing as arm64
for arch in "arm64" "x86_64"; do
- ENV=wheel-${pyver}-universal2-${arch} PYTHON=${python}
maybe_setup_virtualenv || continue
+ VENV_ENV=wheel-${pyver}-universal2-${arch} PYTHON=${python}
maybe_setup_virtualenv || continue
# install pyarrow's universal2 wheel
pip install
pyarrow-${VERSION}-cp${pyver/.}-cp${pyver/.}-macosx_11_0_universal2.whl
# check the imports and execute the unittests
