Unpin tox version in Beam code base (#26082)

AnandInguva · web-flow · commit 97562d9d920a · 2023-06-08T12:10:01.000-04:00
* Update BeamModulePlugin.groovy * add run to the tox cmd * Pin tox upper bound * Revert "Pin tox upper bound" This reverts commit 1502017. * Add /bin/bash to allow list externals * Remove tox versioning * Add comma * Add curl to the allowlist externals * Update sdks/python/tox.ini * Update sdks/python/tox.ini
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -2754,7 +2754,7 @@ class BeamModulePlugin implements Plugin<Project> {
             executable 'sh'
             args '-c', ". ${project.ext.envdir}/bin/activate && " +
                 "pip install --retries 10 --upgrade pip && " +
-                "pip install --retries 10 --upgrade tox==3.20.1 -r ${project.rootDir}/sdks/python/build-requirements.txt"
+                "pip install --retries 10 --upgrade tox -r ${project.rootDir}/sdks/python/build-requirements.txt"
           }
         }
         // Gradle will delete outputs whenever it thinks they are stale. Putting a
diff --git a/sdks/python/apache_beam/io/azure/integration_test/Dockerfile b/sdks/python/apache_beam/io/azure/integration_test/Dockerfile
@@ -32,7 +32,7 @@ COPY sdks/python /app/sdks/python
 COPY model /app/model
 
 # This step should look like setupVirtualenv minus virtualenv creation.
-RUN pip install --no-cache-dir tox==3.11.1 -r sdks/python/build-requirements.txt
+RUN pip install --no-cache-dir tox -r sdks/python/build-requirements.txt
 
 # Add Azurite's self-signed cert to the global CA cert store.
 COPY cert.pem /usr/local/share/ca-certificates/azurite.crt
diff --git a/sdks/python/apache_beam/io/hdfs_integration_test/Dockerfile b/sdks/python/apache_beam/io/hdfs_integration_test/Dockerfile
@@ -30,7 +30,7 @@ COPY sdks/python /app/sdks/python
 COPY model /app/model
 
 # This step should look like setupVirtualenv minus virtualenv creation.
-RUN pip install --no-cache-dir tox==3.11.1 -r sdks/python/build-requirements.txt
+RUN pip install --no-cache-dir tox -r sdks/python/build-requirements.txt
 
 # Run wordcount, and write results to HDFS.
 CMD cd sdks/python && tox -e hdfs_integration_test
diff --git a/sdks/python/scripts/run_tox.sh b/sdks/python/scripts/run_tox.sh
@@ -56,15 +56,15 @@ fi
 if [[ ! -z $2 ]]; then
   SDK_LOCATION="$1"
   shift;
-  tox -c tox.ini --recreate -e "$TOX_ENVIRONMENT" --installpkg "$SDK_LOCATION" -- "$@"
+  tox -c tox.ini run --recreate -e "$TOX_ENVIRONMENT" --installpkg "$SDK_LOCATION" -- "$@"
 else
-  tox -c tox.ini --recreate -e "$TOX_ENVIRONMENT"
+  tox -c tox.ini run --recreate -e "$TOX_ENVIRONMENT"
 fi
 
 exit_code=$?
 # Retry once for the specific exit code 245.
 if [[ $exit_code == 245 ]]; then
-  tox -c tox.ini --recreate -e "$TOX_ENVIRONMENT"
+  tox -c tox.ini run --recreate -e "$TOX_ENVIRONMENT"
   exit_code=$?
 fi
 exit $exit_code
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
@@ -40,6 +40,10 @@ allowlist_externals =
   time
   bash
   rm
+  /bin/sh
+  curl
+  ./codecov
+  chmod
 deps =
   cython: cython==0.29.33
   -r build-requirements.txt
@@ -103,7 +107,7 @@ commands =
 deps =
   pytest-cov==3.0.0
 platform = linux
-passenv = GIT_* BUILD_* ghprb* CHANGE_ID BRANCH_NAME JENKINS_* CODECOV_*
+passenv = GIT_*,BUILD_*,ghprb*,CHANGE_ID,BRANCH_NAME,JENKINS_*,CODECOV_*
 extras = test,gcp,interactive,dataframe,aws
 commands =
   -rm .coverage

Original file line number	Diff line number	Diff line change
`@@ -2754,7 +2754,7 @@ class BeamModulePlugin implements Plugin<Project> {`
`2754`	`2754`	`executable 'sh'`
`2755`	`2755`	`args '-c', ". ${project.ext.envdir}/bin/activate && " +`
`2756`	`2756`	`"pip install --retries 10 --upgrade pip && " +`
`2757`		`- "pip install --retries 10 --upgrade tox==3.20.1 -r ${project.rootDir}/sdks/python/build-requirements.txt"`
	`2757`	`+ "pip install --retries 10 --upgrade tox -r ${project.rootDir}/sdks/python/build-requirements.txt"`
`2758`	`2758`	`}`
`2759`	`2759`	`}`
`2760`	`2760`	`// Gradle will delete outputs whenever it thinks they are stale. Putting a`