Enable XSD validation of tools by default.

jmchilton · jmchilton · commit 1ef05d27cf7a · 2016-09-22T12:13:30.000-04:00
Fixes #567.
diff --git a/planemo/options.py b/planemo/options.py
@@ -1,5 +1,4 @@
-""" Click definitions for various shared options and arguments.
-"""
+"""Click definitions for various shared options and arguments."""
 
 from __future__ import absolute_import
 
@@ -933,11 +932,10 @@ def shed_fail_fast_option():
 
 def lint_xsd_option():
     return planemo_option(
-        "--xsd",
+        "--xsd/--no_xsd",
         is_flag=True,
-        default=False,
-        help=("Include experimental tool XSD validation in linting "
-              "process (requires xmllint on PATH or lxml installed).")
+        default=True,
+        help=("Include tool XSD validation in linting process.")
     )
 
 
@@ -963,8 +961,8 @@ def skip_option():
         "-s",
         "--skip",
         default=None,
-        help=("Comma-separated list of lint tests to skip (e.g send ."
-              "--skip 'citations,xml_order' to skip linting of citations "
+        help=("Comma-separated list of lint tests to skip (e.g. passing "
+              "--skip 'citations,xml_order' would skip linting of citations "
               "and best-practice XML ordering.")
     )
 
diff --git a/planemo/tool_lint.py b/planemo/tool_lint.py
@@ -72,7 +72,7 @@ def build_lint_args(ctx, **kwds):
 
 def _lint_extra_modules(**kwds):
     linters = []
-    if kwds.get("xsd", False):
+    if kwds.get("xsd", True):
         linters.append(planemo.linters.xsd)
 
     if kwds.get("doi", False):
diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,7 @@ docutils
 jinja2
 glob2
 virtualenv
+lxml
 gxformat2>=0.1.1
 ephemeris>=0.2.0
 galaxy-lib>=16.10.0
