Changed VENV_PATH from 'venv' to '.venv'

This commit is contained in:
saundersp 2024-11-08 01:22:49 +01:00
parent 512a21cdb3
commit e9df962d7a
4 changed files with 6 additions and 10 deletions

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
data data
*/models* */models*
venv .venv
*/out* */out*
python/__pycache__ python/__pycache__
cpp/bin cpp/bin

View File

@ -4,16 +4,14 @@
set -e set -e
test -z "$EXEC_DIR" && EXEC_DIR=. test -z "$EXEC_DIR" && EXEC_DIR=.
test -z "$VENV_PATH" && VENV_PATH="$EXEC_DIR/venv" test -z "$VENV_PATH" && VENV_PATH="$EXEC_DIR/.venv"
activate(){ activate(){
if [ ! -d "$VENV_PATH" ]; then if [ ! -d "$VENV_PATH" ]; then
echo 'Creating python virtual environnement' echo 'Creating python virtual environnement'
python -m venv "$VENV_PATH" python -m venv --upgrade-deps "$VENV_PATH"
echo 'Activating virtual environnement' echo 'Activating virtual environnement'
activate activate
echo 'Updating base pip packages'
python -m pip install -U setuptools pip
echo 'Installing requirements' echo 'Installing requirements'
pip install -r requirements.txt pip install -r requirements.txt
elif [ -f "$VENV_PATH"/Scripts/activate ]; then . "$VENV_PATH"/Scripts/activate elif [ -f "$VENV_PATH"/Scripts/activate ]; then . "$VENV_PATH"/Scripts/activate

View File

@ -57,7 +57,7 @@ clean:
.PHONY: mrproper .PHONY: mrproper
mrproper: clean mrproper: clean
@rm -rfv __pycache__ venv @rm -rfv __pycache__ .venv
.PHONY: help .PHONY: help
help: help:

View File

@ -4,16 +4,14 @@
set -e set -e
test -z "$EXEC_DIR" && EXEC_DIR=. test -z "$EXEC_DIR" && EXEC_DIR=.
test -z "$VENV_PATH" && VENV_PATH="$EXEC_DIR/venv" test -z "$VENV_PATH" && VENV_PATH="$EXEC_DIR/.venv"
activate(){ activate(){
if [ ! -d "$VENV_PATH" ]; then if [ ! -d "$VENV_PATH" ]; then
echo 'Creating python virtual environnement' echo 'Creating python virtual environnement'
python -m venv "$VENV_PATH" python -m venv --upgrade-deps "$VENV_PATH"
echo 'Activating virtual environnement' echo 'Activating virtual environnement'
activate activate
echo 'Updating base pip packages'
python -m pip install -U setuptools pip
echo 'Installing requirements' echo 'Installing requirements'
pip install -r requirements.txt pip install -r requirements.txt
elif [ -f "$VENV_PATH"/Scripts/activate ]; then . "$VENV_PATH"/Scripts/activate elif [ -f "$VENV_PATH"/Scripts/activate ]; then . "$VENV_PATH"/Scripts/activate