From 16173769ce59901c557d2efb6f086d417a941eb4 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Tue, 20 May 2025 11:01:40 +0200
Subject: [PATCH] to create sevenv, start from nicosenv, if available

+ always upgrade pip
---
 getsestuff | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/getsestuff b/getsestuff
index 6bc2733..ede4797 100755
--- a/getsestuff
+++ b/getsestuff
@@ -41,6 +41,7 @@ if home.endswith('zolliker'):
 if remote:
     instrument = ''
     nicosroot = ''
+    nicosenv = ''
 else:
     nicosroot = '/home/nicos/nicos'
     if not exists(f'{nicosroot}/.git/config'):
@@ -273,11 +274,20 @@ def do_sevenv():
     """install python packages needed for seweb etc."""
     sevenv = join(home, 'sevenv')
     if not exists(join(sevenv, 'bin')):
-        do(f'python3 -m venv {sevenv}')
+        if exists(nicosenv):
+            # start from nicos env if possible
+            py = join(nicosenv, 'bin/python')
+        else:
+            py = 'python3'
+        do(f'{py} -m venv {sevenv}')
     if exists(join(sevenv, 'bin')):
+        upgrade = True
         for pkg in ['mlzlog', 'scipy', 'psutil', 'flask', 'gevent']:
             if not glob(f'{sevenv}/lib/python3*/site-packages/{pkg}'):
                 if doit:
+                    if upgrade:
+                        do(f'{sevenv}/bin/python3 -m pip --upgrade pip')
+                        upgrade = False
                     do(f'{sevenv}/bin/python3 -m pip install {pkg}')
                 else:
                     print(f'missing {pkg} in sevenv')