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] Always allow 'conda' layout when using 'package_build'

Browse Source
This commit is contained in:
Ray Speth 2023-08-17 23:05:16 -04:00 committed by Ingmar Schoegl
parent 08c1f84071
commit 2e5cd59741
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -2050,7 +2050,7 @@ if conda_prefix is not None and sys.executable.startswith(str(conda_prefix)):
env["prefix"] = conda_prefix.resolve().as_posix() env["prefix"] = conda_prefix.resolve().as_posix()
logger.info( logger.info(
f"Using conda environment as default 'prefix': {env['prefix']}") f"Using conda environment as default 'prefix': {env['prefix']}")
elif env["layout"] == "conda": elif env["layout"] == "conda" and not env["package_build"]:
logger.error("Layout option 'conda' requires a conda environment.") logger.error("Layout option 'conda' requires a conda environment.")
sys.exit(1) sys.exit(1)