mirror of
https://github.com/Cantera/cantera.git
synced 2025-02-25 18:55:29 -06:00
[SCons] Remove non-functional python_array_home option
This option has been broken since before Cantera 2.3.0, so must have been unused.
This commit is contained in:
21
SConstruct
21
SConstruct
@@ -346,11 +346,6 @@ config_options = [
|
||||
PYTHON_CMD is not set, then the configuration process will use the
|
||||
same Python interpreter being used by SCons.""",
|
||||
sys.executable),
|
||||
PathVariable(
|
||||
'python_array_home',
|
||||
"""If NumPy was installed using the '--home' option, set this to the home
|
||||
directory for NumPy for Python 2.""",
|
||||
'', PathVariable.PathAccept),
|
||||
PathVariable(
|
||||
'python_prefix',
|
||||
"""Use this option if you want to install the Cantera Python 2 package to
|
||||
@@ -375,11 +370,6 @@ config_options = [
|
||||
'python2'; if this executable cannot be found, this
|
||||
value must be specified to build the Python 2 module.""",
|
||||
'python2', PathVariable.PathAccept),
|
||||
PathVariable(
|
||||
'python2_array_home',
|
||||
"""If NumPy was installed using the '--home' option, set this to the home
|
||||
directory for NumPy for Python 2.""",
|
||||
'', PathVariable.PathAccept),
|
||||
PathVariable(
|
||||
'python2_prefix',
|
||||
"""Use this option if you want to install the Cantera Python 2 package to
|
||||
@@ -404,11 +394,6 @@ config_options = [
|
||||
'python3'; if this executable cannot be found, this
|
||||
value must be specified to build the Python 3 module.""",
|
||||
'python3', PathVariable.PathAccept),
|
||||
PathVariable(
|
||||
'python3_array_home',
|
||||
"""If NumPy was installed using the '--home' option, set this to the home
|
||||
directory for NumPy for Python 3.""",
|
||||
'', PathVariable.PathAccept),
|
||||
PathVariable(
|
||||
'python3_prefix',
|
||||
"""Use this option if you want to install the Cantera Python 3 package to
|
||||
@@ -1221,7 +1206,7 @@ if env['python_package'] in ('full', 'minimal', 'default'):
|
||||
"ignored.".format(v=major, option=env[py_pkg]))
|
||||
else: # pythonX_package is 'default'
|
||||
# This dictionary has the default values for the Python related variables
|
||||
default_py_vars = {'python{}_array_home': '', 'python{}_cmd': 'python{}'.format(major),
|
||||
default_py_vars = {'python{}_cmd': 'python{}'.format(major),
|
||||
'python{}_prefix': '$prefix'}
|
||||
|
||||
env[py_pkg] = env['python_package']
|
||||
@@ -1238,7 +1223,6 @@ if env['python_package'] in ('full', 'minimal', 'default'):
|
||||
# Make sure everything gets converted to properly versioned variables by deleting
|
||||
# these so they don't get used accidentally
|
||||
del env['python_package']
|
||||
del env['python_array_home']
|
||||
del env['python_cmd']
|
||||
del env['python_prefix']
|
||||
|
||||
@@ -1330,9 +1314,6 @@ def configure_full_python(py_ver):
|
||||
print(err)
|
||||
""")
|
||||
|
||||
if env['python{}_array_home'.format(py_ver)]:
|
||||
script = "sys.path.append({})\n".format(env['python{}_array_home'.format(py_ver)]) + script
|
||||
|
||||
try:
|
||||
info = getCommandOutput(env['python{}_cmd'.format(py_ver)], '-c', script).splitlines()
|
||||
except OSError as err:
|
||||
|
||||
@@ -31,7 +31,6 @@ if localenv['layout'] != 'debian' and env['OS'] != 'Windows':
|
||||
else:
|
||||
env['python_module_loc_sc'] = env['python{}_module_loc'.format(major)]
|
||||
env['python_cmd'] = env['python{}_cmd'.format(major)]
|
||||
env['python_array_home'] = env['python{}_array_home'.format(major)]
|
||||
|
||||
for script in ['setup_cantera', 'setup_cantera.csh']:
|
||||
target = env.SubstFile(script, script + '.in')
|
||||
|
||||
@@ -35,7 +35,3 @@ if ("@python_module_loc_sc@" != "") then
|
||||
setenv PYTHONPATH @python_module_loc_sc@:$PYTHONPATH
|
||||
endif
|
||||
endif
|
||||
|
||||
if ("@python_array_home@" != "") then
|
||||
setenv PYTHONPATH @python_array_home@:$PYTHONPATH
|
||||
endif
|
||||
|
||||
@@ -41,8 +41,4 @@ if [ "@python_module_loc_sc@" != "" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "@python_array_home@" != "" ]; then
|
||||
PYTHONPATH=@python_array_home@:$PYTHONPATH
|
||||
fi
|
||||
|
||||
export PYTHONPATH
|
||||
|
||||
Reference in New Issue
Block a user