Merge pull request #37809 from apache/cp-37719

Amar3tto · web-flow · commit 4b4ed529ffd8 · 2026-03-10T20:23:54.000+04:00
Cherrypick #37719
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -3124,7 +3124,8 @@ class BeamModulePlugin implements Plugin<Project> {
             // pip 25.1 casues :sdks:python:installGcpTest stuck. Pin to 25.0.1 for now.
             args '-c', ". ${project.ext.envdir}/bin/activate && " +
                 "pip install --pre --retries 10 --upgrade pip==25.0.1 --no-cache-dir && " +
-                "pip install --pre --retries 10 --upgrade tox --no-cache-dir"
+                "pip install --pre --retries 10 --upgrade tox --no-cache-dir && " +
+                "pip install --pre --retries 10 --upgrade setuptools build --no-cache-dir"
           }
         }
         // Gradle will delete outputs whenever it thinks they are stale. Putting a

Original file line number	Diff line number	Diff line change
`@@ -3124,7 +3124,8 @@ class BeamModulePlugin implements Plugin<Project> {`
`3124`	`3124`	`// pip 25.1 casues :sdks:python:installGcpTest stuck. Pin to 25.0.1 for now.`
`3125`	`3125`	`args '-c', ". ${project.ext.envdir}/bin/activate && " +`
`3126`	`3126`	`"pip install --pre --retries 10 --upgrade pip==25.0.1 --no-cache-dir && " +`
`3127`		`- "pip install --pre --retries 10 --upgrade tox --no-cache-dir"`
	`3127`	`+ "pip install --pre --retries 10 --upgrade tox --no-cache-dir && " +`
	`3128`	`+ "pip install --pre --retries 10 --upgrade setuptools build --no-cache-dir"`
`3128`	`3129`	`}`
`3129`	`3130`	`}`
`3130`	`3131`	`// Gradle will delete outputs whenever it thinks they are stale. Putting a`