warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix entry point

Browse Source
This commit is contained in:
Daniel Rojas 2021-10-02 14:16:20 +02:00
parent d3e99abaa8
commit b53ce36046
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -29,7 +29,7 @@ setup(
packages=find_packages('src'), packages=find_packages('src'),
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'wireviz=wireviz.wv_cli:main', 'wireviz=wireviz.wv_cli:wireviz',
], ],
}, },
classifiers=[ classifiers=[

3
src/wireviz/wireviz.py
View File

@ -292,3 +292,6 @@ def parse_file(yaml_file: str, file_out: (str, Path) = None) -> None:
file_out = file_out.resolve() file_out = file_out.resolve()
parse(yaml_input, file_out=file_out) parse(yaml_input, file_out=file_out)
if __name__ == '__main__':
print('When running from the command line, please use wv_cli.py instead.')

6
src/wireviz/wv_cli.py
View File

@ -4,6 +4,9 @@ import sys
import click import click
if __name__ == '__main__':
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
from wireviz import APP_NAME, __version__ from wireviz import APP_NAME, __version__
import wireviz.wireviz as wv import wireviz.wireviz as wv
from wireviz.wv_helper import open_file_read from wireviz.wv_helper import open_file_read
@ -19,7 +22,7 @@ epilog += ', '.join([f'{key} ({value.upper()})' for key, value in format_codes.i
@click.option('-p', '--prepend', default=None, type=Path, help='YAML file to prepend to the input file (optional).') @click.option('-p', '--prepend', default=None, type=Path, help='YAML file to prepend to the input file (optional).')
@click.option('-o', '--output-file', default=None, type=Path, help='File name (without extension) to use for output, if different from input file name.') @click.option('-o', '--output-file', default=None, type=Path, help='File name (without extension) to use for output, if different from input file name.')
@click.option('-V', '--version', is_flag=True, default=False, help=f'Output {APP_NAME} version and exit.') @click.option('-V', '--version', is_flag=True, default=False, help=f'Output {APP_NAME} version and exit.')
def main(file, format, prepend, output_file, version): def wireviz(file, format, prepend, output_file, version):
""" """
Parses the provided FILE and generates the specified outputs. Parses the provided FILE and generates the specified outputs.
""" """
@ -79,5 +82,4 @@ def main(file, format, prepend, output_file, version):
print() print()
if __name__ == '__main__': if __name__ == '__main__':
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
wireviz() wireviz()