Skip to content

Commit

Permalink
[SCons] Remove in-tree-build flag from pip
Browse files Browse the repository at this point in the history
This flag doesn't work with pip versions older than 21.1, but Cantera
builds fine without it.

The indicated behavior becomes default in 21.3 anyway, and then starts
generating warnings of its own in pip 22.0.

Fixes #1269
  • Loading branch information
speth authored and bryanwweber committed May 4, 2022
1 parent 9573e6b commit 2bc0263
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions interfaces/cython/SConscript
Expand Up @@ -107,7 +107,7 @@ ext = localenv.LoadableModule(f"cantera/_cantera{module_ext}",
obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,
SHLIBPREFIX="", LIBSUFFIXES=[module_ext])

build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps "
build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps "
"--wheel-dir=build/python/dist build/python")
plat = info['plat'].replace('-', '_').replace('.', '_')
wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}"
Expand Down Expand Up @@ -172,7 +172,7 @@ if env["stage_dir"]:

install_cmd.append(f"--root={stage_dir.resolve()}")

install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall",
install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall",
"build/python"))
if localenv['PYTHON_INSTALLER'] == 'direct':
mod_inst = install(localenv.Command, 'dummy', mod,
Expand Down

0 comments on commit 2bc0263

Please sign in to comment.