From 5aeb76eacf3a625942661fba78e176d90f3dd7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:54:14 +0200
Subject: [PATCH] venv

---
 scripts/_common.sh |  2 +-
 scripts/install    |  7 ++++---
 scripts/upgrade    | 10 ++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index b067b0a..41ddd3c 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="python3-dev python3-pip"
+pkg_dependencies="python3-dev python3-pip python3-venv"
 
 nodejs_version="18"
 
diff --git a/scripts/install b/scripts/install
index 6e97878..a660ea3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -99,8 +99,9 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 mkdir -p "$final_path"
 
 pushd $final_path
-	mkdir -p .venv
-	PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install jupyterlab==$jupyterlab_version jupyterhub jupyter_collaboration notebook jupyterhub-ldapauthenticator pyzmq jupyterlab-language-pack-fr-FR
+	python3 -m venv $final_path/venv
+	source $final_path/venv/bin/activate
+	ynh_exec_warn_less pip install jupyterlab==$jupyterlab_version jupyterhub jupyter_collaboration notebook jupyterhub-ldapauthenticator pyzmq jupyterlab-language-pack-fr-FR
 popd
 
 #=================================================
@@ -116,7 +117,7 @@ ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_p
 ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
 
 chown -R root: $final_path/
-chown -R $admin: $final_path/.venv/
+chown -R $admin: $final_path/venv/
 
 #=================================================
 # SETUP SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index 0b0c09e..8c221c5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -94,7 +94,6 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_use_nodejs
 $ynh_npm install -g configurable-http-proxy
-python3 -m pip install pipenv
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -106,9 +105,12 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Building app..." --weight=160
 
+	ynh_secure_remove $final_path/.venv
+
 	pushd $final_path
-		mkdir -p .venv
-		PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyter_collaboration jupyterhub-ldapauthenticator pyzmq
+		python3 -m venv $final_path/venv
+		source $final_path/venv/bin/activate
+		ynh_exec_warn_less pip install jupyterlab==$jupyterlab_version jupyterhub notebook jupyter_collaboration jupyterhub-ldapauthenticator pyzmq
 	popd
 fi
 
@@ -126,7 +128,7 @@ ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_p
 ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
 
 chown -R root: $final_path/
-chown -R $admin: $final_path/.venv/
+chown -R $admin: $final_path/venv/
 
 #=================================================
 # SETUP SYSTEMD