From 19a52c2a5510395a41ab39e27dada7abdee311d1 Mon Sep 17 00:00:00 2001 From: Xevion Date: Sat, 2 Nov 2019 02:16:04 -0500 Subject: [PATCH] setup.py update for click cli proper --- phototag.py | 9 ++++++++- setup.py | 7 +++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/phototag.py b/phototag.py index 37b2f9a..4812820 100644 --- a/phototag.py +++ b/phototag.py @@ -1,6 +1,7 @@ import sys import os import logging +import click from package import app log = logging.getLogger('main') @@ -8,6 +9,12 @@ log = logging.getLogger('main') os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = os.path.join( sys.path[0], 'package', 'key', 'photo_tagging_service.json') -if __name__ == "__main__": + +@click.command() +def cli(): log.info('Executing package...') sys.exit(app.run()) + + +if __name__ == "__main__": + main() diff --git a/setup.py b/setup.py index c32bfa4..66d763b 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import os import io from setuptools import find_packages, setup -DEPENDENCIES = [] +DEPENDENCIES = ['Click'] EXCLUDE_FROM_PACKAGES = [] CURDIR = sys.path[0] @@ -23,7 +23,10 @@ setup( include_package_data=True, keywords=[], scripts=[], - entry_points={"console_scripts": ["phototag=phototag.main:main"]}, + entry_points=''' + [console_scripts] + phototag=phototag.phototag:cli + ''', zip_safe=False, install_requires=DEPENDENCIES, python_requires=">=3.6",