2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/98a91b2610ab/ Changeset: 98a91b2610ab User: jmchilton Date: 2013-12-10 16:43:07 Summary: Resolve default package definitions if extact version is unavailable. Old behavior can be reverted by setting up a dependency_resolvers_conf.xml with the following contents ``` <dependency_resolvers><tool_shed_packages /><galaxy_packages /></dependency_resolvers> ``` The new behavior corresponds to the following dependency_resolvers_conf.xml contents: ``` <dependency_resolvers><tool_shed_packages /><galaxy_packages /><galaxy_packages versionless="true" /></dependency_resolvers> ``` Still think galaxy_packages should come before tool_shed_packages in resolution order so that deployers can fix broken tool shed installs with manual installs or deploy optimized versions of packages without having to mess with a dependency_resolvers_conf.xml file. Affected #: 2 files diff -r 3bf805dfa14eb150e90c1aab565eb22b8ab3d9b8 -r 98a91b2610abbffd0a299c6ae9bae075ca5561f4 lib/galaxy/tools/deps/__init__.py --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -76,6 +76,7 @@ return [ ToolShedPackageDependencyResolver(self), GalaxyPackageDependencyResolver(self), + GalaxyPackageDependencyResolver(self, versionless=True), ] def __parse_resolver_conf_xml(self, tree): diff -r 3bf805dfa14eb150e90c1aab565eb22b8ab3d9b8 -r 98a91b2610abbffd0a299c6ae9bae075ca5561f4 test/unit/test_tool_deps.py --- a/test/unit/test_tool_deps.py +++ b/test/unit/test_tool_deps.py @@ -42,9 +42,10 @@ 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" https://bitbucket.org/galaxy/galaxy-central/commits/7200976bcad7/ Changeset: 7200976bcad7 User: dannon Date: 2013-12-11 19:11:06 Summary: Merged in jmchilton/galaxy-central-fork-1 (pull request #272) Resolve default package definitions if exact version is unavailable. Affected #: 2 files diff -r 7e45d419c54da8122f7b5d8e0ace3641e450a727 -r 7200976bcad7741fe663f86492824dc5b3e24f50 lib/galaxy/tools/deps/__init__.py --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -76,6 +76,7 @@ return [ ToolShedPackageDependencyResolver(self), GalaxyPackageDependencyResolver(self), + GalaxyPackageDependencyResolver(self, versionless=True), ] def __parse_resolver_conf_xml(self, root): diff -r 7e45d419c54da8122f7b5d8e0ace3641e450a727 -r 7200976bcad7741fe663f86492824dc5b3e24f50 test/unit/test_tool_deps.py --- a/test/unit/test_tool_deps.py +++ b/test/unit/test_tool_deps.py @@ -42,9 +42,10 @@ 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" Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.