This is an automated email from the ASF dual-hosted git repository.
anandinguva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new e47054ebd04 Simplify passing custom requirement files. (#29502)
e47054ebd04 is described below
commit e47054ebd040c07704182c123d0da76c7bce567a
Author: tvalentyn <[email protected]>
AuthorDate: Tue Nov 21 07:10:54 2023 -0800
Simplify passing custom requirement files. (#29502)
---
sdks/python/scripts/run_integration_test.sh | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/sdks/python/scripts/run_integration_test.sh
b/sdks/python/scripts/run_integration_test.sh
index 5ac3627a096..67714712472 100755
--- a/sdks/python/scripts/run_integration_test.sh
+++ b/sdks/python/scripts/run_integration_test.sh
@@ -215,17 +215,6 @@ if [[ -z $PIPELINE_OPTS ]]; then
echo "[WARNING] Could not find SDK tarball in SDK_LOCATION: $SDK_LOCATION."
fi
- # Install test dependencies for ValidatesRunner tests.
- # pyhamcrest==1.10.0 doesn't work on Py2.
- # See: https://github.com/hamcrest/PyHamcrest/issues/131.
- if [[ -z $REQUIREMENTS_FILE ]]; then
- echo "pyhamcrest!=1.10.0,<2.0.0" > postcommit_requirements.txt
- echo "mock<3.0.0" >> postcommit_requirements.txt
- echo "parameterized>=0.7.1,<0.8.0" >> postcommit_requirements.txt
- else
- cp $REQUIREMENTS_FILE postcommit_requirements.txt
- fi
-
# Options used to run testing pipeline on Cloud Dataflow Service. Also used
for
# running on DirectRunner (some options ignored).
opts=(
@@ -236,7 +225,6 @@ if [[ -z $PIPELINE_OPTS ]]; then
"--temp_location=$GCS_LOCATION/temp-it"
"--output=$GCS_LOCATION/py-it-cloud/output"
"--sdk_location=$SDK_LOCATION"
- "--requirements_file=postcommit_requirements.txt"
"--num_workers=$NUM_WORKERS"
"--sleep_secs=$SLEEP_SECS"
)
@@ -246,6 +234,10 @@ if [[ -z $PIPELINE_OPTS ]]; then
opts+=("--streaming")
fi
+ if [[ -n "$REQUIREMENTS_FILE" ]]; then
+ opts+=("--requirements_file=$REQUIREMENTS_FILE")
+ fi
+
if [[ "$ARCH" == "ARM" ]]; then
opts+=("--machine_type=t2a-standard-1")
