Skip to content

fix(venv): Use the interpreter to abspath #590

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

Merged
merged 6 commits into from
Jun 10, 2025
Merged

fix(venv): Use the interpreter to abspath #590

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8159e21
tweak(venv): Use the interpreter to abspath
arrdem Jun 10, 2025
eacb806
Avoid capturing the trailing /
arrdem Jun 10, 2025
a66c3f6
Update layer listings
arrdem Jun 10, 2025
80a82e5
Fix: Don't pollute stdout
arrdem Jun 10, 2025
effe89f
Whitespace
arrdem Jun 10, 2025
716c463
Update manifests.
arrdem Jun 10, 2025
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 py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,7 +2510,7 @@ files:
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/
- -rwxr-xr-x 0 0 0 8099 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
- -rwxr-xr-x 0 0 0 8619 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
- -rwxr-xr-x 0 0 0 817416 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python
- -rwxr-xr-x 0 0 0 817416 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
- -rwxr-xr-x 0 0 0 817416 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
Expand Down
2 changes: 1 addition & 1 deletion py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2491,7 +2491,7 @@ files:
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/
- -rwxr-xr-x 0 0 0 8100 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
- -rwxr-xr-x 0 0 0 8620 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
- -rwxr-xr-x 0 0 0 698064 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python
- -rwxr-xr-x 0 0 0 698064 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
- -rwxr-xr-x 0 0 0 698064 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
Expand Down
20 changes: 19 additions & 1 deletion py/tools/py/src/activate.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export PYTHONEXECUTABLE
# unset PYTHONHOME if set
# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
# could use `if (set -u; : $PYTHONHOME) ;` in bash.
_OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
_OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-_activate_undef}"
unset PYTHONHOME

_OLD_VIRTUAL_PATH="$PATH"
Expand All @@ -85,6 +85,24 @@ _OLD_VIRTUAL_PATH="$PATH"
# can provide some fallback handling around runfiles too.
{{RUNFILES_INTERPRETER}}

_abspath() {
"${PYTHONEXECUTABLE}" -c 'import os, sys; print(os.path.abspath(sys.argv[1]))' "$@"
}

# Re-export abspath'd vars
# This allows us to avoid relative path issues without incurring sandbox escapes
VIRTUAL_ENV="$(_abspath "${VIRTUAL_ENV}")"
export VIRTUAL_ENV

PYTHONEXECUTABLE="$(_abspath "${PYTHONEXECUTABLE}")"
export PYTHONEXECUTABLE

if [ -n "${PYTHONHOME:-}" ]; then
PYTHONHOME="$(_abspath "${PYTHONHOME}")"
export PYTHONHOME
fi

# Now we can put the venv's absolute bin on the path
PATH="$VIRTUAL_ENV/bin:$PATH"
export PATH

Expand Down
4 changes: 2 additions & 2 deletions py/tools/py/src/runfiles_interpreter.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# --- Runfiles-based interpreter setup --
# --- Runfiles-based interpreter setup ---

# If the runfiles dir is unset AND we will fail to find a runfiles manifest
# based on inspecting $0, we need to try something different.
Expand All @@ -22,7 +22,7 @@ _activate_find_runfiles() {
# find the manifest file and runfiles tree relative to the execroot.

# HACK: We can't lazy-match to the first /bin/, so we have to manually count four groups
EXECROOT="$(echo "${1}" | sed 's/\(execroot\/[^\/]*\/[^\/]*\/[^\/]*\/[^\/]*\/\).*$/\1/' )"
EXECROOT="$(echo "${1}" | sed 's/\(execroot\/[^\/]*\/[^\/]*\/[^\/]*\/[^\/]*\).*$/\1/' )"
export RUNFILES_DIR="${EXECROOT}/${RUNFILES_PATH}"
elif [[ "${1}" == *.runfiles/* ]]; then
# Examples:
Expand Down
Loading