diff --git a/setup.py b/setup.py index f7971e0..9707d74 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ setup( packages=find_packages('src'), entry_points={ 'console_scripts': [ - 'wireviz=wireviz.wv_cli:main', + 'wireviz=wireviz.wv_cli:wireviz', ], }, classifiers=[ diff --git a/src/wireviz/wireviz.py b/src/wireviz/wireviz.py index f78f8e4..97c0e7c 100755 --- a/src/wireviz/wireviz.py +++ b/src/wireviz/wireviz.py @@ -292,3 +292,6 @@ def parse_file(yaml_file: str, file_out: (str, Path) = None) -> None: file_out = file_out.resolve() parse(yaml_input, file_out=file_out) + +if __name__ == '__main__': + print('When running from the command line, please use wv_cli.py instead.') diff --git a/src/wireviz/wv_cli.py b/src/wireviz/wv_cli.py index 17bd406..1b00f7f 100644 --- a/src/wireviz/wv_cli.py +++ b/src/wireviz/wv_cli.py @@ -4,6 +4,9 @@ import sys import click +if __name__ == '__main__': + sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) + from wireviz import APP_NAME, __version__ import wireviz.wireviz as wv 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('-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.') -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. """ @@ -79,5 +82,4 @@ def main(file, format, prepend, output_file, version): print() if __name__ == '__main__': - sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) wireviz()