From 7608233de911d1889c78956d19b10f060bf76c31 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 2 Jul 2024 13:51:54 -0400 Subject: [PATCH] Fixes. --- lib/galaxy/tools/stock.py | 4 ++-- .../tools/parameters/gx_select_multiple_optional.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/tools/stock.py b/lib/galaxy/tools/stock.py index b10d76db9f44..65287242644e 100644 --- a/lib/galaxy/tools/stock.py +++ b/lib/galaxy/tools/stock.py @@ -6,13 +6,13 @@ # (once we are running the tool shed from packages not rooted with Galaxy). import galaxy.tools from galaxy.tool_util.parser import get_tool_source -from galaxy.util import galaxy_root_path +from galaxy.util import galaxy_directory from galaxy.util.resources import files def stock_tool_paths(): yield from _walk_directory_for_tools(files(galaxy.tools)) - yield from _walk_directory_for_tools(galaxy_root_path / "test" / "functional" / "tools") + yield from _walk_directory_for_tools(galaxy_directory() / "test" / "functional" / "tools") def stock_tool_sources(): diff --git a/test/functional/tools/parameters/gx_select_multiple_optional.xml b/test/functional/tools/parameters/gx_select_multiple_optional.xml index 3025b72aed54..8e42fb8b14af 100644 --- a/test/functional/tools/parameters/gx_select_multiple_optional.xml +++ b/test/functional/tools/parameters/gx_select_multiple_optional.xml @@ -1,4 +1,4 @@ - + > '$output' ]]> @@ -16,10 +16,10 @@ echo '$parameter' >> '$output' - + - +