Always recreate venv, preferring py3

ome · Nov 27, 2019 · 11c2b98 · 11c2b98
1 parent 8901081
commit 11c2b98
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/autogen_omero.sh b/autogen_omero.sh
@@ -22,11 +22,12 @@ test -e $WORKSPACE/OMERO.server
 test -e $WORKSPACE/omero-install
 test -e $WORKSPACE/omeroweb-install
 
-if [ ! -e $WORKSPACE/venv ]; then
-    virtualenv $WORKSPACE/venv
-    $WORKSPACE/venv/bin/pip install -r $WORKSPACE/OMERO.server/share/web/requirements-py27.txt
-    $WORKSPACE/venv/bin/pip install future
+if [ -e $WORKSPACE/venv ]; then
+    rm -rf $WORKSPACE/venv
 fi
+python3 -m venv --system-site-packages $WORKSPACE/venv || virtualenv --system-site-packages $WORKSPACE/venv
+$WORKSPACE/venv/bin/pip install -r $WORKSPACE/OMERO.server/share/web/requirements-py27.txt
+$WORKSPACE/venv/bin/pip install future
 set +u # PS1 issue
 . $WORKSPACE/venv/bin/activate
 set -u