From 1a7a55f85bdf3fdc69822d5b79d8dfcf6ea83098 Mon Sep 17 00:00:00 2001 From: Shunping Huang Date: Fri, 12 Dec 2025 09:45:14 -0500 Subject: [PATCH 1/2] Revert "Unpin the pip version in setupVirtualenv (#36745)" This reverts commit 02743314acf81a390c7fb9305da585f5b0af0485. --- .github/trigger_files/beam_PreCommit_Python_ML.json | 4 ---- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/trigger_files/beam_PreCommit_Python_ML.json b/.github/trigger_files/beam_PreCommit_Python_ML.json index 07d1fb889961..e69de29bb2d1 100644 --- a/.github/trigger_files/beam_PreCommit_Python_ML.json +++ b/.github/trigger_files/beam_PreCommit_Python_ML.json @@ -1,4 +0,0 @@ -{ - "comment": "Modify this file in a trivial way to cause this test suite to run.", - "modification": 0 -} diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index e8928ab885a8..daa8ed85e524 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3122,8 +3122,12 @@ class BeamModulePlugin implements Plugin { } project.exec { executable 'sh' + // TODO: https://github.com/apache/beam/issues/29022 + // pip 23.3 is failing due to Hash mismatch between expected SHA of the packaged and actual SHA. + // until it is resolved on pip's side, don't use pip's cache. + // 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 --no-cache-dir && " + + "pip install --pre --retries 10 --upgrade pip==25.0.1 --no-cache-dir && " + "pip install --pre --retries 10 --upgrade tox --no-cache-dir" } } From 96e679007498ed5de6c3cd0baa91e5684800b79e Mon Sep 17 00:00:00 2001 From: Shunping Huang Date: Fri, 12 Dec 2025 12:10:29 -0500 Subject: [PATCH 2/2] Trigger previously failed workflow. --- .github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json diff --git a/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json b/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json new file mode 100644 index 000000000000..616d37428c01 --- /dev/null +++ b/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json @@ -0,0 +1,4 @@ +{ + "comment": "Modify this file in a trivial way to cause this test suite to run", + "revision": 1 +}