From 4db996a4de91f9ed816b3abce16e9db2f9ffefcf Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 6 Jun 2017 10:33:42 -0400 Subject: [PATCH] Move galaxy.tools.toolbox.cache to galaxy.tools.cache. galaxy.tools.toolbox is shared with galaxy-lib and so should have no dependencies on sqlalchemy. Also this really seems to be caching tools and tool shed repositories and fairly independent of the toolbox abstraction so I think it is solid refactoring independent of the sqlalchemy/galaxy-lib constraints. --- lib/galaxy/app.py | 2 +- lib/galaxy/tools/{toolbox => }/cache.py | 0 test/unit/tools/test_toolbox.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/galaxy/tools/{toolbox => }/cache.py (100%) diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py index 55fc3ffe2612..6bdba337d35e 100644 --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -22,7 +22,7 @@ from galaxy.sample_tracking import external_service_types from galaxy.openid.providers import OpenIDProviders from galaxy.tools.data_manager.manager import DataManagers -from galaxy.tools.toolbox.cache import ( +from galaxy.tools.cache import ( ToolCache, ToolShedRepositoryCache ) diff --git a/lib/galaxy/tools/toolbox/cache.py b/lib/galaxy/tools/cache.py similarity index 100% rename from lib/galaxy/tools/toolbox/cache.py rename to lib/galaxy/tools/cache.py diff --git a/test/unit/tools/test_toolbox.py b/test/unit/tools/test_toolbox.py index 0dfb4edd70a5..6a64976ff5ef 100644 --- a/test/unit/tools/test_toolbox.py +++ b/test/unit/tools/test_toolbox.py @@ -11,7 +11,7 @@ from galaxy.model import tool_shed_install from galaxy.model.tool_shed_install import mapping from galaxy.tools import ToolBox -from galaxy.tools.toolbox.cache import ToolCache +from galaxy.tools.cache import ToolCache from galaxy.tools.toolbox.lineages.tool_shed import ToolVersionCache from galaxy.tools.toolbox.watcher import get_tool_conf_watcher from galaxy.webapps.galaxy.config_watchers import ConfigWatchers