restore exception handling with enforce --user install for older pip versions that don't do that automatically
This commit is contained in:
@ -10,7 +10,7 @@ build target in the conventional and CMake based build systems
|
|||||||
# copy LAMMPS shared library and lammps package to system dirs
|
# copy LAMMPS shared library and lammps package to system dirs
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
import sys,os,shutil,time,glob
|
import sys,os,shutil,time,glob,subprocess
|
||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
|
|
||||||
parser = ArgumentParser(prog='install.py',
|
parser = ArgumentParser(prog='install.py',
|
||||||
@ -66,6 +66,17 @@ os.remove(os.path.join('lammps',os.path.basename(args.lib)))
|
|||||||
|
|
||||||
print("Installing wheel")
|
print("Installing wheel")
|
||||||
for wheel in glob.glob('lammps-*.whl'):
|
for wheel in glob.glob('lammps-*.whl'):
|
||||||
os.system(sys.executable + " -m pip install --force-reinstall " + wheel)
|
try:
|
||||||
|
txt = subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--force-reinstall', wheel], stderr=subprocess.STDOUT, shell=False)
|
||||||
|
print(txt.decode('UTF-8'))
|
||||||
|
continue
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
print('Installing wheel into standard site-packages folder failed. Trying user folder now')
|
||||||
|
txt = subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--user', '--force-reinstall', wheel], stderr=subprocess.STDOUT, shell=False)
|
||||||
|
print(txt.decode('UTF-8'))
|
||||||
|
except:
|
||||||
|
sys.exit('Failed to install wheel ' + wheel)
|
||||||
shutil.copy(wheel, olddir)
|
shutil.copy(wheel, olddir)
|
||||||
os.remove(wheel)
|
os.remove(wheel)
|
||||||
|
|||||||
Reference in New Issue
Block a user