Skip to content

Improved python tool support #673

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
marco-gallegos wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Improved python tool support #673

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e7a699
chore(developer): updated theme to suport venvs and uv
marco-gallegos Apr 10, 2025
30e4f59
fix(developer): lint
marco-gallegos Apr 10, 2025
20ed3ce
fix(developer): validation on env var content
marco-gallegos May 16, 2025
3900cff
chore(developer): some small fixes
May 16, 2025
13ac122
Update themes/developer/developer.theme.sh
akinomyoga Aug 21, 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
16 changes: 14 additions & 2 deletions themes/developer/developer.theme.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,24 @@ function _omb_theme_developer__read_ruby_version {
## @var[out] REPLY
function _omb_theme_developer__readPyVersion {
local val_py=$(python --version 2>/dev/null | cut -d ' ' -f 2)
local val_uv=$(uv --version 2>/dev/null | cut -d ' ' -f 2)
local val_venv=""

## according some docs this env var just exist when a venv/uv venv is active
if [[ -n "$VIRTUAL_ENV" ]]; then
val_venv=" ($(echo "$VIRTUAL_ENV" | awk -F/ '{print $(NF-1)"/"$NF}'))"
Copy link
Contributor

@akinomyoga akinomyoga Apr 19, 2025

Choose a reason for hiding this comment

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

I'm wondering what happens when VIRTUAL_ENV contains a newline in the path. The above would output multiple aaa/bbb pairs. Also, what happens when VIRTUAL_ENV doesn't contain any /? It would output / + $VIRTUAL_ENV, but I'm not sure if it's the intended behavior. I'd suggest simply doing

Suggested change
if [[ -n "$VIRTUAL_ENV" ]]; then
val_venv=" ($(echo "$VIRTUAL_ENV" | awk -F/ '{print $(NF-1)"/"$NF}'))"
if [[ $VIRTUAL_ENV =~ [^/]+/[^/]+$ ]]; then
val_venv=" ($BASH_REMATCH)"

Copy link
Contributor

@akinomyoga akinomyoga Aug 21, 2025

Choose a reason for hiding this comment

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

Also, what happens when VIRTUAL_ENV doesn't contain any /?

This hasn't been answered. Or is it ensured that it VIRTUAL_ENV contains /?

fi

if _omb_util_command_exists conda; then
local condav=$(conda env list | awk '$2 == "*" {print $1}')
val_py="conda<$condav> $val_py"
else
# Si nvm no está instalado, utilizar "njs"
val_py="py $val_py"
if _omb_util_command_exists uv; then
val_py="uv($val_uv) $val_py$val_venv"
else
# if conda and uv is not installed use "py"
val_py="py $val_py"
fi
fi
REPLY=$val_py
}
Expand Down
Loading