Skip to content

Commit

Permalink
Fix python_minimal interface to install Cantera YAML tools
Browse files Browse the repository at this point in the history
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 <torokhov-s-a@yandex.ru>
  • Loading branch information
band-a-prend authored and speth committed Apr 10, 2021
1 parent 3d672b0 commit b3c69ac
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions interfaces/python_minimal/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion interfaces/python_minimal/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 3 additions & 0 deletions interfaces/python_minimal/cantera/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
from . import ck2cti
from . import ctml_writer
from . import ck2yaml
from . import cti2yaml
from . import ctml2yaml
3 changes: 3 additions & 0 deletions interfaces/python_minimal/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
},
)

0 comments on commit b3c69ac

Please sign in to comment.