Skip to content

Fix Xlang IO Direct installGcpTest uv cache lock #38862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aIbrahiim wants to merge 3 commits into
base: master
Choose a base branch
from
+4 −2
Open

Fix Xlang IO Direct installGcpTest uv cache lock #38862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c83dc9
Fix Xlang IO Direct installGcpTest uv cache lock
aIbrahiim Jun 9, 2026
ef14715
use with per env cache dir
aIbrahiim Jun 9, 2026
ea21f0d
Added quote paths
aIbrahiim Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/trigger_files/beam_PostCommit_Python_Xlang_IO_Direct.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run",
"modification": 3
"modification": 5
}
4 changes: 3 additions & 1 deletion buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3143,9 +3143,11 @@ class BeamModulePlugin implements Plugin<Project> {
if (extra) {
installTargets = "${distTarBall}[${packages},${extra}]"
}
def uvCacheDir = "${project.ext.envdir}/.uv_cache"
project.exec {
executable 'sh'
args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --pre ${installTargets}"
// Default uv cache is global; py310/py314 installGcpTest fight over the same lock.
args '-c', ". \"${project.ext.envdir}/bin/activate\" && pip install uv && uv pip install --cache-dir \"${uvCacheDir}\" --pre \"${installTargets}\""
}
Comment on lines +3146 to 3151

@gemini-code-assist gemini-code-assist Bot Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

If the project path or virtual environment directory (envdir) contains spaces (which is common in local development environments), executing the shell command without quotes will fail. It is safer to wrap the paths in double quotes within the shell command to ensure robustness.

          def uvCacheDir = "${project.ext.envdir}/.uv_cache"
          project.exec {
            executable 'sh'
            // Default uv cache is global; py310/py314 installGcpTest fight over the same lock.
            args '-c', ". \"${project.ext.envdir}/bin/activate\" && pip install uv && uv pip install --cache-dir \"${uvCacheDir}\" --pre \"${installTargets}\""
          }

@Abacn Abacn Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment looks reasonable.

}
}
Expand Down
Loading