From e9df962d7a0d39cd1d90858a56fe934d9571318f Mon Sep 17 00:00:00 2001
From: saundersp <pierre.saundersgb@gmail.com>
Date: Fri, 8 Nov 2024 01:22:49 +0100
Subject: [PATCH] Changed VENV_PATH from 'venv' to '.venv'

---
 .gitignore             | 2 +-
 downloader/activate.sh | 6 ++----
 python/Makefile        | 2 +-
 python/activate.sh     | 6 ++----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b8a532..041f4b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 data
 */models*
-venv
+.venv
 */out*
 python/__pycache__
 cpp/bin
diff --git a/downloader/activate.sh b/downloader/activate.sh
index b8433b1..00a3c50 100755
--- a/downloader/activate.sh
+++ b/downloader/activate.sh
@@ -4,16 +4,14 @@
 set -e
 
 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(){
 	if [ ! -d "$VENV_PATH" ]; then
 		echo 'Creating python virtual environnement'
-		python -m venv "$VENV_PATH"
+		python -m venv --upgrade-deps "$VENV_PATH"
 		echo 'Activating virtual environnement'
 		activate
-		echo 'Updating base pip packages'
-		python -m pip install -U setuptools pip
 		echo 'Installing requirements'
 		pip install -r requirements.txt
 	elif [ -f "$VENV_PATH"/Scripts/activate ]; then . "$VENV_PATH"/Scripts/activate
diff --git a/python/Makefile b/python/Makefile
index 842a5f6..93c1622 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -57,7 +57,7 @@ clean:
 
 .PHONY: mrproper
 mrproper: clean
-	@rm -rfv __pycache__ venv
+	@rm -rfv __pycache__ .venv
 
 .PHONY: help
 help:
diff --git a/python/activate.sh b/python/activate.sh
index b8433b1..00a3c50 100755
--- a/python/activate.sh
+++ b/python/activate.sh
@@ -4,16 +4,14 @@
 set -e
 
 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(){
 	if [ ! -d "$VENV_PATH" ]; then
 		echo 'Creating python virtual environnement'
-		python -m venv "$VENV_PATH"
+		python -m venv --upgrade-deps "$VENV_PATH"
 		echo 'Activating virtual environnement'
 		activate
-		echo 'Updating base pip packages'
-		python -m pip install -U setuptools pip
 		echo 'Installing requirements'
 		pip install -r requirements.txt
 	elif [ -f "$VENV_PATH"/Scripts/activate ]; then . "$VENV_PATH"/Scripts/activate