GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

[SCons] Fix logic for NumPy API define with Cython 3.0

Browse Source
This commit is contained in:
Bryan Weber
2024-06-20 10:57:50 -04:00
committed by Ray Speth
parent 5f1ec8f75f
commit 4aaa4436e3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@@ -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:

2
site_scons/buildutils.py
View File

@@ -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")