From b3c69ac08605308d7ab140fde41dd1d272a462c8 Mon Sep 17 00:00:00 2001 From: band-a-prend Date: Sat, 10 Apr 2021 00:23:04 +0300 Subject: [PATCH] Fix python_minimal interface to install Cantera YAML tools The python_minimal SConscript did't copy cantera yaml tools to python_minimal directory and therefore didn's install these scripts. Signed-off-by: band-a-prend --- interfaces/python_minimal/.gitignore | 3 +++ interfaces/python_minimal/SConscript | 2 +- interfaces/python_minimal/cantera/__init__.py | 3 +++ interfaces/python_minimal/setup.py.in | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interfaces/python_minimal/.gitignore b/interfaces/python_minimal/.gitignore index 4d311c802b..5ca4392ca9 100644 --- a/interfaces/python_minimal/.gitignore +++ b/interfaces/python_minimal/.gitignore @@ -2,6 +2,9 @@ setup*.py scripts/* cantera/ck2cti.py cantera/ctml_writer.py +cantera/ck2yaml.py +cantera/cti2yaml.py +cantera/ctml2yaml.py build dist Cantera_minimal.egg-info diff --git a/interfaces/python_minimal/SConscript b/interfaces/python_minimal/SConscript index 3767161b73..adb4787992 100644 --- a/interfaces/python_minimal/SConscript +++ b/interfaces/python_minimal/SConscript @@ -8,7 +8,7 @@ localenv = env.Clone() make_setup = build(localenv.SubstFile('setup.py', 'setup.py.in')) # copy scripts from the full Cython module -for script in ['ctml_writer', 'ck2cti']: +for script in ['ctml_writer', 'ck2cti', 'ck2yaml', 'cti2yaml', 'ctml2yaml']: # The actual script s = build(env.Command('cantera/{}.py'.format(script), '#interfaces/cython/cantera/{}.py'.format(script), diff --git a/interfaces/python_minimal/cantera/__init__.py b/interfaces/python_minimal/cantera/__init__.py index 005271e591..588c74faf0 100644 --- a/interfaces/python_minimal/cantera/__init__.py +++ b/interfaces/python_minimal/cantera/__init__.py @@ -1,2 +1,5 @@ from . import ck2cti from . import ctml_writer +from . import ck2yaml +from . import cti2yaml +from . import ctml2yaml diff --git a/interfaces/python_minimal/setup.py.in b/interfaces/python_minimal/setup.py.in index c60d6e88c7..ead7760440 100644 --- a/interfaces/python_minimal/setup.py.in +++ b/interfaces/python_minimal/setup.py.in @@ -12,6 +12,9 @@ setup(name="Cantera_minimal", 'console_scripts': [ 'ck2cti=cantera.ck2cti:script_entry_point', 'ctml_writer=cantera.ctml_writer:main', + 'ck2yaml=cantera.ck2yaml:script_entry_point', + 'cti2yaml=cantera.cti2yaml:main', + 'ctml2yaml=cantera.ctml2yaml:main', ], }, )