Skip to content

fix(plugins/uv): Avoid modifying already relocatable venv #2565

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
carlcsaposs-canonical wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(plugins/uv): Avoid modifying already relocatable venv #2565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion charmcraft/parts/plugins/_uv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ def get_build_commands(self) -> list[str]:
return [
*super().get_build_commands(),
*utils.get_venv_cleanup_commands(
self._get_venv_directory(), keep_bins=False
self._get_venv_directory(),
keep_bins=False,
# craft-parts already uses `uv venv --relocatable`
make_relocatable=False,
),
]
20 changes: 13 additions & 7 deletions charmcraft/utils/parts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ def get_charm_copy_commands(
return commands


def get_venv_cleanup_commands(venv_path: pathlib.Path, *, keep_bins: bool) -> list[str]:
def get_venv_cleanup_commands(
venv_path: pathlib.Path, *, keep_bins: bool, make_relocatable: bool = True
) -> list[str]:
"""Get a script do Charmcraft-specific venv cleanup.

:param venv_path: The path to the venv.
:param keep_bins: Whether to keep the bin directory of the venv.
:param make_relocatable: Whether to make the activate script portable
:returns: A shell script to do this, as a string.
"""
venv_bin = venv_path / "bin"
Expand All @@ -74,12 +77,15 @@ def get_venv_cleanup_commands(venv_path: pathlib.Path, *, keep_bins: bool) -> li
f"rm -rf {venv_bin}/!(activate)",
"shopt -u extglob",
]
update_activate = [
# Replace hard-coded path in `activate` with portable path
# "\&" is escape for sed
'sed -i \'s#^VIRTUAL_ENV=.*$#VIRTUAL_ENV="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." \\&> /dev/null \\&\\& pwd )"#\' '
+ str(venv_bin / "activate"),
]
if make_relocatable:
update_activate = [
# Replace hard-coded path in `activate` with portable path
# "\&" is escape for sed
'sed -i \'s#^VIRTUAL_ENV=.*$#VIRTUAL_ENV="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." \\&> /dev/null \\&\\& pwd )"#\' '
+ str(venv_bin / "activate"),
]
else:
update_activate = []
delete_lib64 = textwrap.dedent(f"""
if [ -L '{venv_lib64}' ]; then
rm -f '{venv_lib64}'
Expand Down
Loading