From d7f2776d7b19bb99ef5d464ffa63c63a98f63423 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 4 Sep 2024 23:09:27 -0400 Subject: [PATCH 1/3] xmllint on galaxy.xsd --- Makefile | 3 + lib/galaxy/tool_util/xsd/galaxy.xsd | 513 ++++++++++------------------ 2 files changed, 185 insertions(+), 331 deletions(-) diff --git a/Makefile b/Makefile index ec4b04e0860c..fbfd14558e1d 100644 --- a/Makefile +++ b/Makefile @@ -186,6 +186,9 @@ else $(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS) endif +format-xsd: + xmllint --format --output galaxy-tmp.xsd lib/galaxy/tool_util/xsd/galaxy.xsd + mv galaxy-tmp.xsd lib/galaxy/tool_util/xsd/galaxy.xsd build-api-schema: $(IN_VENV) python scripts/dump_openapi_schema.py _schema.yaml diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index ec549456dbc5..c65d0d9ed22b 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -1,15 +1,9 @@ - + Galaxy Schema A Galaxy XML tool wrapper - - - + + - + - + @@ -136,7 +130,7 @@ the tool menu immediately following the hyperlink for the tool (based on the - + @@ -244,7 +238,6 @@ this attribute defined the HTTP request method to use when communicating with an - Frequently, tools may require the same XML @@ -266,8 +259,7 @@ Example: macros.xml -````]]> - +````]]> @@ -287,14 +279,12 @@ Usage example: mypackage -````]]> - +````]]> - - - - ` is identical to ``, `` is identical to `