From 7b7dc08610a3ae498a2ae294053eeacdace93d3b Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Thu, 7 Feb 2019 13:09:53 -0800 Subject: [PATCH 1/4] feat: allow sam to be invoked as a module - python -m samcli.cli.main --- samcli/cli/main.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/samcli/cli/main.py b/samcli/cli/main.py index 66127aa8b9..383b9fcf03 100644 --- a/samcli/cli/main.py +++ b/samcli/cli/main.py @@ -4,6 +4,7 @@ import logging import json +import sys import click from samcli import __version__ @@ -63,3 +64,7 @@ def cli(ctx): https://github.com/awslabs/serverless-application-model. """ pass + + +if __name__ == '__main__': + sys.exit(cli()) From 80faa88a1d0e00b5d6b2a6383cac9f1ecb4d562b Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Wed, 13 Feb 2019 11:08:00 -0800 Subject: [PATCH 2/4] fix: move __main__ up to `samcli` module --- samcli/__main__.py | 5 +++++ samcli/cli/main.py | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 samcli/__main__.py diff --git a/samcli/__main__.py b/samcli/__main__.py new file mode 100644 index 0000000000..23b7df184a --- /dev/null +++ b/samcli/__main__.py @@ -0,0 +1,5 @@ +import sys +from samcli.cli.main import cli + +if __name__ == "__main__": + sys.exit(cli()) diff --git a/samcli/cli/main.py b/samcli/cli/main.py index 383b9fcf03..66127aa8b9 100644 --- a/samcli/cli/main.py +++ b/samcli/cli/main.py @@ -4,7 +4,6 @@ import logging import json -import sys import click from samcli import __version__ @@ -64,7 +63,3 @@ def cli(ctx): https://github.com/awslabs/serverless-application-model. """ pass - - -if __name__ == '__main__': - sys.exit(cli()) From 836d5317cda35a5500592ebb310fb554c8eac5f0 Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Wed, 13 Feb 2019 12:30:35 -0800 Subject: [PATCH 3/4] fix: travis build - added pylint rule for __main__.py because we dont need to pass ctx to cli, it gets added as part of a decorator. - added docstring --- .pylintrc | 2 +- samcli/__main__.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index c0987c591e..1d864729c6 100644 --- a/.pylintrc +++ b/.pylintrc @@ -9,7 +9,7 @@ # Add files or directories to the blacklist. They should be base names, not # paths. -ignore=compat.py +ignore=compat.py, __main__.py # Pickle collected data for later comparisons. persistent=yes diff --git a/samcli/__main__.py b/samcli/__main__.py index 23b7df184a..c60da7b841 100644 --- a/samcli/__main__.py +++ b/samcli/__main__.py @@ -1,3 +1,9 @@ +""" +Invokable Module for CLI + +python -m samcli +""" + import sys from samcli.cli.main import cli From 34dd6e65cd709736d82d196e0dd5aa508aef4430 Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Wed, 13 Feb 2019 14:07:44 -0800 Subject: [PATCH 4/4] fix: click handles exit codes --- samcli/__main__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samcli/__main__.py b/samcli/__main__.py index c60da7b841..6b8d9261ce 100644 --- a/samcli/__main__.py +++ b/samcli/__main__.py @@ -4,8 +4,7 @@ python -m samcli """ -import sys from samcli.cli.main import cli if __name__ == "__main__": - sys.exit(cli()) + cli()