diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47c6823c3f5be1a23cd9458b754306d15d11d13c..faa4f5158d1736274471ed2ff93cb8f5312af60d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ variables: CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}" CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base" CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit" - GALAXY_VERSION_PYTHON: 24.2.dev6+ornl - GALAXY_VERSION_DOCKER: 24.2.dev6.ornl + GALAXY_VERSION_PYTHON: 24.2.dev7+ornl + GALAXY_VERSION_DOCKER: 24.2.dev7.ornl # This import is for the func_rse_docker_* functions before_script: diff --git a/lib/galaxy/tool_util/toolbox/base.py b/lib/galaxy/tool_util/toolbox/base.py index ae7ce9a2458414c6892174bcde35046f3fe3a367..9c993eb84eab94e46ba797c455adb4d5ac445965 100644 --- a/lib/galaxy/tool_util/toolbox/base.py +++ b/lib/galaxy/tool_util/toolbox/base.py @@ -634,6 +634,7 @@ class AbstractToolBox(ManagesIntegratedToolPanelMixin): section_dict = { "id": val.id or "", "name": val.name or "", + "description": val.description or "", "version": val.version or "", } section = ToolSection(section_dict) diff --git a/lib/galaxy/tool_util/toolbox/integrated_panel.py b/lib/galaxy/tool_util/toolbox/integrated_panel.py index 4ceb8a5ae244b73bb6b4be46d85d72b3cc83f036..f51d9b476fa0249458a28124f2ece63115a175e7 100644 --- a/lib/galaxy/tool_util/toolbox/integrated_panel.py +++ b/lib/galaxy/tool_util/toolbox/integrated_panel.py @@ -96,9 +96,10 @@ $INTEGRATED_TOOL_PANEL elif item_type == panel_item_types.SECTION: section_id = item.id or "" section_name = item.name or "" + section_description = item.description or "" section_version = item.version or "" integrated_tool_panel.append( - f'
\n' + f'
\n' ) for _section_key, section_item_type, section_item in item.panel_items_iter(): if section_item_type == panel_item_types.TOOL: