Skip to content

Commit 48251ec

Browse files
author
Peter Amstutz
committed
Allow override of version string
1 parent a3581a0 commit 48251ec

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

cwltool/main.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -469,14 +469,22 @@ def makeRelative(u):
469469

470470
stdout.write(json.dumps(deps, indent=4))
471471

472+
def versionstring():
473+
pkg = pkg_resources.require("cwltool")
474+
if pkg:
475+
return "%s %s" % (sys.argv[0], pkg[0].version)
476+
else:
477+
return "%s %s" % (sys.argv[0], "unknown version")
478+
472479
def main(args=None,
473480
executor=single_job_executor,
474481
makeTool=workflow.defaultMakeTool,
475482
selectResources=None,
476483
parser=None,
477484
stdin=sys.stdin,
478485
stdout=sys.stdout,
479-
stderr=sys.stderr):
486+
stderr=sys.stderr,
487+
versionfunc=versionstring):
480488

481489
_logger.removeHandler(defaultStreamHandler)
482490
_logger.addHandler(logging.StreamHandler(stderr))
@@ -494,13 +502,11 @@ def main(args=None,
494502
if args.debug:
495503
_logger.setLevel(logging.DEBUG)
496504

497-
pkg = pkg_resources.require("cwltool")
498-
if pkg:
499-
if args.version:
500-
print "%s %s" % (sys.argv[0], pkg[0].version)
501-
return 0
502-
else:
503-
_logger.info("%s %s", sys.argv[0], pkg[0].version)
505+
if args.version:
506+
print versionfunc()
507+
return 0
508+
else:
509+
_logger.info(versionfunc())
504510

505511
if not args.workflow:
506512
parser.print_help()

0 commit comments

Comments
 (0)