research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCons] Make issues importing NumPy easier to diagnose

Browse source
This commit is contained in:
Ray Speth 2017-07-31 17:17:44 -04:00
parent 3d03795c4f
commit 3f69f6ac8a
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SConstruct
View file

@ -1100,18 +1100,21 @@ if env['python_package'] in ('full', 'default'):
print 'INFO: Using Cython version {0}.'.format(cython_version)
# Test to see if we can import the specified array module
script = '\n'.join(("from distutils.sysconfig import *",
"print get_python_version()",
script = '\n'.join(("from __future__ import print_function",
"from distutils.sysconfig import *",
"print(get_python_version())",
"try:",
" import numpy",
" print numpy.__version__",
"except ImportError:",
" print '0.0.0'",
" print(numpy.__version__)",
"except ImportError as err:",
" import sys",
" print(err, file=sys.stderr)",
" print('0.0.0')",
"import site",
"try:",
" print site.getusersitepackages()",
" print(site.getusersitepackages())",
"except AttributeError:",
" print site.USER_SITE"))
" print(site.USER_SITE)"))
if env['python_array_home']:
script = "sys.path.append({})\n".format(env['python_array_home']) + script
@ -1208,7 +1211,9 @@ if env['python3_package'] in ('y', 'default'):
"try:",
" import numpy",
" print(numpy.__version__)",
"except ImportError:",
"except ImportError as err:",
" import sys",
" print(err, file=sys.stderr)",
" print('0.0.0')",
"import site",
"try:",

2
site_scons/buildutils.py
View file

@ -600,7 +600,7 @@ def getCommandOutput(cmd, *args):
if 'PYTHONHOME' in environ:
# Can cause problems when trying to run a different Python interpreter
del environ['PYTHONHOME']
data = subprocess.check_output([cmd] + list(args), stderr=subprocess.STDOUT, env=environ)
data = subprocess.check_output([cmd] + list(args), env=environ)
return data.strip()
# Monkey patch for SCons Cygwin bug