diff --git a/ide/opsfile.yml b/ide/opsfile.yml index 917c378..c565b6c 100644 --- a/ide/opsfile.yml +++ b/ide/opsfile.yml @@ -48,7 +48,7 @@ tasks: You can then use 'ops ide devel' and 'ops ide deploy'. You can also reopen the project with VSCode and use the command 'Reopen in Container'. cmds: - - test -e "/.dockerenv" || die "{{.MSG}}" + - test -e "/.dockerenv" || test -e '/.bestiaenv' || die "{{.MSG}}" - test "$(python3 -V | awk -F. '{print $2}')" -ge 10 || die "python 3.10 or greater not available" - test -x "$(which virtualenv)" || die "you need python virtualenv" - test "$(node -v | awk -F. '{print substr($1,2) }')" -ge 18 || die "nodejs 18 or greater not available" diff --git a/ide/python/build-venv.sh b/ide/python/build-venv.sh index cf94ce5..30a7b72 100644 --- a/ide/python/build-venv.sh +++ b/ide/python/build-venv.sh @@ -20,13 +20,9 @@ DIR="${1:?directory}" ZIP="${2:?zip file}" cd "$DIR" if ! test -d virtualenv - then virtualenv virtualenv +then uv venv virtualenv --python=/usr/bin/python3 fi -source virtualenv/bin/activate -pip install --upgrade pip -pip install -r requirements.txt -virtualenv/bin/python -m pip uninstall -y -q setuptools wheel pip -touch virtualenv/bin/activate +uv pip install --python= virtualenv/bin/python -r requirements.txt if test -f "$ZIP" then rm "$ZIP" fi diff --git a/ide/python/installer.code-workspace b/ide/python/installer.code-workspace new file mode 100644 index 0000000..0a4554e --- /dev/null +++ b/ide/python/installer.code-workspace @@ -0,0 +1,17 @@ +{ + "folders": [ + { + "path": "../../.." + }, + { + "path": "../../../../python-starter" + } + ], + "settings": { + "workbench.colorCustomizations": { + "activityBar.background": "#5A0F2E", + "titleBar.activeBackground": "#7E1541", + "titleBar.activeForeground": "#FEFBFD" + } + } +} \ No newline at end of file diff --git a/ide/util/opsfile.yml b/ide/util/opsfile.yml index 0d30e1b..7ff0c9d 100644 --- a/ide/util/opsfile.yml +++ b/ide/util/opsfile.yml @@ -30,11 +30,11 @@ tasks: then $OPS ide python zip DIR="$($OPS -opspath "packages/{{.A}}")" elif test -e "packages/{{.A}}/package.json" then $OPS ide nodejs zip DIR="$($OPS -opspath "packages/{{.A}}")" - else echo "no zip environment" + else true #echo "no zip environment" fi action: - desc: build an action filling its zip file + desc: build an action filling its zip file silent: true requires: { vars: [A]} cmds: