Skip to content

Commit

Permalink
Stop with tool migrations by default, they are not needed in modern G…
Browse files Browse the repository at this point in the history
…alaxies...

... and even problematic in some ways.
  • Loading branch information
jmchilton committed Jan 27, 2019
1 parent 6a660e9 commit d83db6a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
11 changes: 5 additions & 6 deletions config/galaxy.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,11 @@ galaxy:

# Enable / disable checking if any tools defined in the above non-shed
# tool_config_files (i.e., tool_conf.xml) have been migrated from the
# Galaxy code distribution to the Tool Shed. This setting should
# generally be set to False only for development Galaxy environments
# that are often rebuilt from scratch where migrated tools do not need
# to be available in the Galaxy tool panel. If the following setting
# remains commented, the default setting will be True.
#check_migrate_tools: true
# Galaxy code distribution to the Tool Shed. This functionality is
# largely untested in modern Galaxy releases and has serious issues
# such as #7273 and the possibility of slowing down Galaxy startup, so
# the default and recommended value is False.
#check_migrate_tools: false

# Tool config maintained by tool migration scripts. If you use the
# migration scripts to install tools that have been migrated to the
Expand Down
13 changes: 6 additions & 7 deletions doc/source/admin/galaxy_options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,12 @@
:Description:
Enable / disable checking if any tools defined in the above non-
shed tool_config_files (i.e., tool_conf.xml) have been migrated
from the Galaxy code distribution to the Tool Shed. This setting
should generally be set to False only for development Galaxy
environments that are often rebuilt from scratch where migrated
tools do not need to be available in the Galaxy tool panel. If
the following setting remains commented, the default setting will
be True.
:Default: ``true``
from the Galaxy code distribution to the Tool Shed. This
functionality is largely untested in modern Galaxy releases and
has serious issues such as #7273 and the possibility of slowing
down Galaxy startup, so the default and recommended value is
False.
:Default: ``false``
:Type: bool


Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def __init__(self, **kwargs):

# Check for tools defined in the above non-shed tool configs (i.e., tool_conf.xml) tht have
# been migrated from the Galaxy code distribution to the Tool Shed.
self.check_migrate_tools = string_as_bool(kwargs.get('check_migrate_tools', True))
self.check_migrate_tools = string_as_bool(kwargs.get('check_migrate_tools', False))
self.shed_tool_data_path = kwargs.get("shed_tool_data_path", None)
self.x_frame_options = kwargs.get("x_frame_options", "SAMEORIGIN")
if self.shed_tool_data_path:
Expand Down
10 changes: 4 additions & 6 deletions lib/galaxy/webapps/galaxy/config_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,14 @@ mapping:
check_migrate_tools:
type: bool
default: true
default: false
required: false
desc: |
Enable / disable checking if any tools defined in the above non-shed
tool_config_files (i.e., tool_conf.xml) have been migrated from the Galaxy
code distribution to the Tool Shed. This setting should generally be set to
False only for development Galaxy environments that are often rebuilt from
scratch where migrated tools do not need to be available in the Galaxy tool
panel. If the following setting remains commented, the default setting will
be True.
code distribution to the Tool Shed. This functionality is largely untested
in modern Galaxy releases and has serious issues such as #7273 and the possibility
of slowing down Galaxy startup, so the default and recommended value is False.
migrated_tools_config:
type: str
Expand Down

0 comments on commit d83db6a

Please sign in to comment.