From 41344cd9e5fa065754227b3f5ba582234f1290af Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Wed, 20 Nov 2024 10:57:24 +0100 Subject: [PATCH 1/2] add requirement/resource to schema docs --- doc/schema_template.md | 1 + lib/galaxy/tool_util/xsd/galaxy.xsd | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/doc/schema_template.md b/doc/schema_template.md index d08c7a4a0d06..99a744495d21 100644 --- a/doc/schema_template.md +++ b/doc/schema_template.md @@ -31,6 +31,7 @@ $tag:tool|creator|organization://complexType[@name='Organization'] $tag:tool|requirements://complexType[@name='Requirements'] $tag:tool|requirements|requirement://complexType[@name='Requirement'] $tag:tool|requirements|container://complexType[@name='Container'] +$tag:tool|requirements|resource://complexType[@name='Container'] $tag:tool|required_files://complexType[@name='RequiredFiles'] $tag:tool|required_files|include://complexType[@name='RequiredFileInclude'] $tag:tool|required_files|exclude://complexType[@name='RequiredFileExclude'] diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index 0890052b56a0..82af0d17ff8f 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -675,6 +675,12 @@ resolver. + + + From ea724bfafd47e36ce4f2088626663df120e19fbe Mon Sep 17 00:00:00 2001 From: M Bernt Date: Wed, 20 Nov 2024 11:19:45 +0100 Subject: [PATCH 2/2] Fix --- doc/schema_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/schema_template.md b/doc/schema_template.md index 99a744495d21..d6577843ba2f 100644 --- a/doc/schema_template.md +++ b/doc/schema_template.md @@ -31,7 +31,7 @@ $tag:tool|creator|organization://complexType[@name='Organization'] $tag:tool|requirements://complexType[@name='Requirements'] $tag:tool|requirements|requirement://complexType[@name='Requirement'] $tag:tool|requirements|container://complexType[@name='Container'] -$tag:tool|requirements|resource://complexType[@name='Container'] +$tag:tool|requirements|resource://complexType[@name='Resource'] $tag:tool|required_files://complexType[@name='RequiredFiles'] $tag:tool|required_files|include://complexType[@name='RequiredFileInclude'] $tag:tool|required_files|exclude://complexType[@name='RequiredFileExclude']