Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Showing usage message when no arguments are passed #319

Merged
merged 4 commits into from
Mar 3, 2017

Conversation

kapilkd13
Copy link
Contributor

When we run cwltool without any argument we get a "try -h" message. Instead of that directly show Usage message.

@cwl-bot
Copy link

cwl-bot commented Mar 3, 2017

Can one of the admins verify this patch?

@mr-c
Copy link
Member

mr-c commented Mar 3, 2017

Jenkins, okay to test

cwltool/main.py Outdated
@@ -630,7 +631,8 @@ def main(argsl=None, # type: List[str]
setattr(args, "workflow", "CWLFile")
else:
_logger.error("")
_logger.error("CWL document required, try --help for details")
_logger.error("CWL document required, No input file was passed\n")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the \n really needed?

I would say "CWL document required, no input file was provided"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really, should I remove it

cwltool/main.py Outdated
@@ -432,6 +432,7 @@ def load_job_order(args, t, stdin, print_input_deps=False, relative_deps=False,
if toolparser:
if args.tool_help:
toolparser.print_help()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cwltool/main.py:435:1: W293 blank line contains whitespace
from https://travis-ci.org/common-workflow-language/cwltool/jobs/207374774#L164

@kapilkd13
Copy link
Contributor Author

updated message, removed space

@mr-c mr-c merged commit 36de782 into common-workflow-language:master Mar 3, 2017
@mr-c
Copy link
Member

mr-c commented Mar 3, 2017

Thanks!

qiukunlong pushed a commit to qiukunlong/cwltool that referenced this pull request Mar 25, 2017
aa320ec Merge pull request common-workflow-language#342 from common-workflow-language/fix-mystery-package-errors
3c6eaff Update for rename of argparse2cwl to argparse2tool
b14404b remove errant jsonldPredicate
7f116da Merge pull request common-workflow-language#339 from common-workflow-language/dockerOutputDirectory
4f65d1f Add test for dockerOutputDirectory option of DockerRequirement.
cb1f928 Merge pull request common-workflow-language#335 from common-workflow-language/output-literals
d8b6c8f Add tests for file and directory literals in output as produced by expression tool.
ee3bb1c Merge pull request common-workflow-language#324 from common-workflow-language/secondaryfiles-array
5e6c2d4 Add NLeSC's Xenon
cbe1c8d Merge pull request common-workflow-language#334 from StarvingMarvin/master
8300e43 output ids must start with '#' in draft-2
f87d218 draft-3 test fixes: explicit output for args
8b10319 Fixes for draft-2 tests: adding explicit args output
83ed4b4 Merge remote-tracking branch 'rabix-cwl/master'
e0a5e7c Merge pull request common-workflow-language#328 from StarvingMarvin/master
d906c4a dir4 test fix
21bdcaf Merge remote-tracking branch 'upstream/master'
dee0f4e Disabled checksum check for listing input dir
fc4cb0f Added args output and empty.json for null jobs
a4950f4 Update tools list
8e1d67c Add Rabix Bunny CI badge
2a5b95e fixing mentions to draft3/4
1356c45 Add test for secondaryFiles with arrays
b60125b Single instead of double quotes in doc
179835b Merge pull request common-workflow-language#319 from common-workflow-language/test-cwl-out2
ed40737 Add additional test for cwl.output.json behavior.
a217bb6 Merge pull request common-workflow-language#317 from StarvingMarvin/master
8dd69f2 fixing test in v1.0 and v1.1.0-dev1
e831c20 Merge pull request common-workflow-language#314 from common-workflow-language/test-requirements-on-steps
8cad6f1 Add test for requirements/hints on workflow steps.
7679adb Merge pull request common-workflow-language#308 from common-workflow-language/embedded-subworkflow-test
1582677 Tighten up formatting
779c2d4 Add test for embedded subworkflow
e22a9c2 Merge pull request common-workflow-language#307 from alaindomissy/patch-3
125cb5f Update UserGuide.yml
99f4f9f Merge pull request common-workflow-language#303 from common-workflow-language/include-stdin-in-docs
5324dbb put stdin shortcut in correct place

git-subtree-dir: cwltool/schemas
git-subtree-split: aa320ec
tetron added a commit that referenced this pull request Jul 23, 2017
Add additional test for cwl.output.json behavior.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants