opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17102 from mvdbeek/fix_loading_default_tools_in_packaged_galaxy

Browse Source 
[23.1] Set correct tool_path for packaged galaxy
This commit is contained in:
Marius van den Beek
2023-11-29 18:37:32 +01:00
committed by GitHub
parent ac5ebaea7d 63c74022a2
commit cd46ff3261
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config/__init__.py
+8 -1
View File
@@ -850,7 +850,14 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
self.install_database_engine_options = get_database_engine_options(kwargs, model_prefix="install_")
self.shared_home_dir = kwargs.get("shared_home_dir")
self.cookie_path = kwargs.get("cookie_path")
self.tool_path = self._in_root_dir(self.tool_path)
if not running_from_source and kwargs.get("tool_path") is None:
try:
self.tool_path = str(files("galaxy.tools") / "bundled")
except ModuleNotFoundError:
# Might not be a full galaxy installation
self.tool_path = self._in_root_dir(self.tool_path)
else:
self.tool_path = self._in_root_dir(self.tool_path)
self.tool_data_path = self._in_root_dir(self.tool_data_path)
if not running_from_source and kwargs.get("tool_data_path") is None:
self.tool_data_path = self._in_data_dir(self.schema.defaults["tool_data_path"])