Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

Support passing a name through to the lint context so that error messages can be more useful #121

Merged
bgruening merged 1 commit into from
Jul 24, 2018
Merged

Support passing a name through to the lint context so that error messages can be more useful #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions galaxy/tools/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
LEVEL_ERROR = "error"


def lint_tool_source(tool_source, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[]):
lint_context = LintContext(level=level, skip_types=skip_types)
def lint_tool_source(tool_source, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[], name=None):
lint_context = LintContext(level=level, skip_types=skip_types, object_name=name)
lint_tool_source_with(lint_context, tool_source, extra_modules)

return not lint_context.failed(fail_level)


def lint_xml(tool_xml, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[]):
lint_context = LintContext(level=level, skip_types=skip_types)
def lint_xml(tool_xml, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[], name=None):
lint_context = LintContext(level=level, skip_types=skip_types, object_name=name)
lint_xml_with(lint_context, tool_xml, extra_modules)

return not lint_context.failed(fail_level)
Expand Down Expand Up @@ -63,9 +63,10 @@ def lint_xml_with(lint_context, tool_xml, extra_modules=[]):
# be moved to galaxy.util.lint.
class LintContext(object):

def __init__(self, level, skip_types=[]):
def __init__(self, level, skip_types=[], object_name=None):
self.skip_types = skip_types
self.level = level
self.object_name = object_name
self.found_errors = False
self.found_warns = False

Expand Down
⚡