From 02da74f19b4b0039ddb7d4a557f961173ded59df Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Mon, 17 Jul 2017 08:38:44 -0600 Subject: [PATCH 1/2] entry points attempt for windows --- descarteslabs/scripts/{descarteslabs => __main__.py} | 4 +++- setup.py | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename descarteslabs/scripts/{descarteslabs => __main__.py} (96%) diff --git a/descarteslabs/scripts/descarteslabs b/descarteslabs/scripts/__main__.py similarity index 96% rename from descarteslabs/scripts/descarteslabs rename to descarteslabs/scripts/__main__.py index 04326c91..fa73f4ed 100755 --- a/descarteslabs/scripts/descarteslabs +++ b/descarteslabs/scripts/__main__.py @@ -15,5 +15,7 @@ from descarteslabs.scripts.parser import parser, handle -if __name__ == "__main__": + +def main(): handle(parser.parse_args()) + diff --git a/setup.py b/setup.py index 3e4dadf8..53cb6496 100644 --- a/setup.py +++ b/setup.py @@ -56,9 +56,11 @@ def do_setup(): kwargs['version'] = version kwargs['packages'] = find_packages('.') kwargs['package_data'] = {'descarteslabs.services': ['gd_bundle-g2-g1.crt']} - kwargs['scripts'] = [ - 'descarteslabs/scripts/descarteslabs', - ] + kwargs['entry_points'] = { + 'console_scripts': [ + 'descarteslabs = descarteslabs.scripts.__main__:main' + ] + } kwargs['install_requires'] = [ "cachetools", "six" From bf018d138a2f369eb2573f2cdf20bacebd060806 Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Mon, 17 Jul 2017 08:46:49 -0600 Subject: [PATCH 2/2] rm extra line --- descarteslabs/scripts/__main__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/descarteslabs/scripts/__main__.py b/descarteslabs/scripts/__main__.py index fa73f4ed..0409e02c 100755 --- a/descarteslabs/scripts/__main__.py +++ b/descarteslabs/scripts/__main__.py @@ -18,4 +18,3 @@ def main(): handle(parser.parse_args()) -