to create sevenv, start from nicosenv, if available
+ always upgrade pip
This commit is contained in:
12
getsestuff
12
getsestuff
@ -41,6 +41,7 @@ if home.endswith('zolliker'):
|
|||||||
if remote:
|
if remote:
|
||||||
instrument = ''
|
instrument = ''
|
||||||
nicosroot = ''
|
nicosroot = ''
|
||||||
|
nicosenv = ''
|
||||||
else:
|
else:
|
||||||
nicosroot = '/home/nicos/nicos'
|
nicosroot = '/home/nicos/nicos'
|
||||||
if not exists(f'{nicosroot}/.git/config'):
|
if not exists(f'{nicosroot}/.git/config'):
|
||||||
@ -273,11 +274,20 @@ def do_sevenv():
|
|||||||
"""install python packages needed for seweb etc."""
|
"""install python packages needed for seweb etc."""
|
||||||
sevenv = join(home, 'sevenv')
|
sevenv = join(home, 'sevenv')
|
||||||
if not exists(join(sevenv, 'bin')):
|
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')):
|
if exists(join(sevenv, 'bin')):
|
||||||
|
upgrade = True
|
||||||
for pkg in ['mlzlog', 'scipy', 'psutil', 'flask', 'gevent']:
|
for pkg in ['mlzlog', 'scipy', 'psutil', 'flask', 'gevent']:
|
||||||
if not glob(f'{sevenv}/lib/python3*/site-packages/{pkg}'):
|
if not glob(f'{sevenv}/lib/python3*/site-packages/{pkg}'):
|
||||||
if doit:
|
if doit:
|
||||||
|
if upgrade:
|
||||||
|
do(f'{sevenv}/bin/python3 -m pip --upgrade pip')
|
||||||
|
upgrade = False
|
||||||
do(f'{sevenv}/bin/python3 -m pip install {pkg}')
|
do(f'{sevenv}/bin/python3 -m pip install {pkg}')
|
||||||
else:
|
else:
|
||||||
print(f'missing {pkg} in sevenv')
|
print(f'missing {pkg} in sevenv')
|
||||||
|
Reference in New Issue
Block a user