Skip to content

Improved XSD lint reporting. #871

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.

Sign up for GitHub

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

Merged
jmchilton merged 3 commits into from
Sep 14, 2018
Merged

Improved XSD lint reporting. #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76e1e3c
Pass the tool file name when linting so that errors can reference it
natefoo Jun 26, 2018
eecc124
Revert changes to requirements.txt.
jmchilton Sep 13, 2018
cd80c05
Merge remote-tracking branch 'galaxyproject/master' into xml-lint-name
jmchilton Sep 13, 2018
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
4 changes: 2 additions & 2 deletions planemo/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ def is_doi(publication_id, lint_ctx):

def lint_xsd(lint_ctx, schema_path, path):
"""Lint XML at specified path with supplied schema."""
name = os.path.basename(path)
name = lint_ctx.object_name or os.path.basename(path)
validator = validation.get_validator(require=True)
validation_result = validator.validate(schema_path, path)
if not validation_result.passed:
msg = "Invalid %s found. Errors [%s]"
msg = "Invalid XML found in file: %s. Errors [%s]"
msg = msg % (name, validation_result.output)
lint_ctx.error(msg)
else:
Expand Down
4 changes: 3 additions & 1 deletion planemo/tool_lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from __future__ import absolute_import

from os.path import basename

from galaxy.tools.lint import lint_tool_source

from planemo.exit_codes import (
Expand Down Expand Up @@ -28,7 +30,7 @@ def lint_tools_on_path(ctx, paths, lint_args, **kwds):
exit_codes.append(EXIT_CODE_GENERIC_FAILURE)
continue
info("Linting tool %s" % tool_path)
if not lint_tool_source(tool_xml, **lint_args):
if not lint_tool_source(tool_xml, name=basename(tool_path), **lint_args):
error("Failed linting")
exit_codes.append(EXIT_CODE_GENERIC_FAILURE)
else:
Expand Down
⚡