Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b00887b9d7e471c65155740db548effd75dc4703 https://github.com/galaxyproject/galaxy/commit/b00887b9d7e471c65155740db548e... Author: John Chilton jmchilton@gmail.com Date: 2017-01-18 (Wed, 18 Jan 2017)

Changed paths: M lib/galaxy/tools/__init__.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- Fixup circular dependency in #3427.

Unfortunately the "root" of the problem is that galaxy.tools.deps.requirements.ToolRequirement should be importable without importing galaxy.tools - but it cannot be currently just because of the way things are structured.

Commit: c4f5a2cfb8b7a34faf05367a5f4d8073ab229b98 https://github.com/galaxyproject/galaxy/commit/c4f5a2cfb8b7a34faf05367a5f4d8... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-01-19 (Thu, 19 Jan 2017)

Changed paths: M lib/galaxy/tools/__init__.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- Merge pull request #3447 from jmchilton/ts_import_cycle

Fixup circular dependency in #3427.

Compare: https://github.com/galaxyproject/galaxy/compare/94150df087b2...c4f5a2cfb8b7