mirror of
https://github.com/Cantera/cantera.git
synced 2024-07-07 04:53:34 -05:00
[SCons] Fix logic for NumPy API define with Cython 3.0
This commit is contained in:
parent
5f1ec8f75f
commit
4aaa4436e3
|
@ -1828,10 +1828,12 @@ if env['python_package'] != 'none':
|
|||
warn_no_full_package = True
|
||||
elif cython_version < parse_version("3.0.0"):
|
||||
logger.info(
|
||||
f"Using Cython version {cython_version} (uses legacy NumPy API)")
|
||||
env["numpy_1_7_API"] = True
|
||||
f"Using Cython version {cython_version} (uses legacy NumPy API)"
|
||||
)
|
||||
env["require_numpy_1_7_API"] = True
|
||||
else:
|
||||
logger.info(f"Using Cython version {cython_version}")
|
||||
env["require_numpy_1_7_API"] = False
|
||||
|
||||
pytest_version = versions.get("pytest")
|
||||
if not check_for_pytest:
|
||||
|
|
|
@ -1382,7 +1382,7 @@ def setup_python_env(env):
|
|||
if env['OS_BITS'] == 64:
|
||||
env.Append(CPPDEFINES='MS_WIN64')
|
||||
|
||||
if "numpy_1_7_API" in env:
|
||||
if not env.get("require_numpy_1_7_API", True):
|
||||
env.Append(CPPDEFINES="NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION")
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user