diff --git a/lib/galaxy/tools/deps/__init__.py b/lib/galaxy/tools/deps/__init__.py index 55809bf1388..4bd546c2520 100644 --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -76,6 +76,7 @@ class DependencyManager( object ): return [ ToolShedPackageDependencyResolver(self), GalaxyPackageDependencyResolver(self), + GalaxyPackageDependencyResolver(self, versionless=True), ] def __parse_resolver_conf_xml(self, tree): diff --git a/test/unit/test_tool_deps.py b/test/unit/test_tool_deps.py index f49a4fe978c..7c206489a98 100644 --- a/test/unit/test_tool_deps.py +++ b/test/unit/test_tool_deps.py @@ -42,9 +42,10 @@ def test_tool_dependencies(): dependency = dm.find_dep( "dep1", None ) assert dependency.version == "2.0" - ## Test default will not be fallen back upon by default + ## Test default resolve will be fall back on default package dependency + ## when using the default resolver. dependency = dm.find_dep( "dep1", "2.1" ) - assert dependency == INDETERMINATE_DEPENDENCY + assert dependency.version == "2.0" # 2.0 is defined as default_version TEST_REPO_USER = "devteam"