ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support installing the built wheel into virtual environment, if active

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-06-17 06:52:25 -04:00
parent 21b3020a97
commit 18f9e5836b
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/install.py
View File

@ -84,6 +84,10 @@ if args.noinstall:
# install the wheel with pip. first try to install in the default environment. # install the wheel with pip. first try to install in the default environment.
# that will be a virtual environment, if active, or the system folder. # that will be a virtual environment, if active, or the system folder.
# if in a virtual environment, we must not use the python executable
# that is running this script (configured by cmake), but use "python"
# from the regular system path. The user may have changed to the virtual
# environment *after* running cmake.
# recent versions of pip will automatically drop to use the user folder # recent versions of pip will automatically drop to use the user folder
# in case the system folder is not writable. # in case the system folder is not writable.
@ -93,10 +97,16 @@ if args.noinstall:
# must be uninstalled manually. We must not ignore this and drop # must be uninstalled manually. We must not ignore this and drop
# back to install into a (forced) user folder. # back to install into a (forced) user folder.
print("Installing wheel") if "VIRTUAL_ENV" in os.environ:
print("Installing wheel into virtual environment")
py_exe = 'python'
else:
print("Installing wheel into system site-packages folder")
py_exe = sys.executable
for wheel in glob.glob('lammps-*.whl'): for wheel in glob.glob('lammps-*.whl'):
try: try:
txt = subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--force-reinstall', wheel], stderr=subprocess.STDOUT, shell=False) txt = subprocess.check_output([py_exe, '-m', 'pip', 'install', '--force-reinstall', wheel], stderr=subprocess.STDOUT, shell=False)
print(txt.decode('UTF-8')) print(txt.decode('UTF-8'))
continue continue
except subprocess.CalledProcessError as err: except subprocess.CalledProcessError as err:
@ -104,7 +114,7 @@ for wheel in glob.glob('lammps-*.whl'):
if errmsg.find("distutils installed"): if errmsg.find("distutils installed"):
sys.exit(errmsg + "You need to uninstall the LAMMPS python module manually first.\n") sys.exit(errmsg + "You need to uninstall the LAMMPS python module manually first.\n")
try: try:
print('Installing wheel into standard site-packages folder failed. Trying user folder now') print('Installing wheel into system 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) txt = subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--user', '--force-reinstall', wheel], stderr=subprocess.STDOUT, shell=False)
print(txt.decode('UTF-8')) print(txt.decode('UTF-8'))
except: except: