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.
galaxyproject · Jun 6, 2017 · 4db996a · 4db996a
1 parent 9d1a382
commit 4db996a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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 → lib/galaxy/tools/cache.py b/lib/galaxy/tools/toolbox/cache.py → lib/galaxy/tools/cache.py
diff --git 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