Branch: refs/heads/release_18.09 Home: https://github.com/galaxyproject/galaxy Commit: cf2645f9a658c5e122fea0309bf73a1f64590c39 https://github.com/galaxyproject/galaxy/commit/cf2645f9a658c5e122fea0309bf73... Author: mvdbeek m.vandenbeek@gmail.com Date: 2018-10-29 (Mon, 29 Oct 2018)

Changed paths: M lib/galaxy/webapps/tool_shed/api/tools.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/workflow_util.py

Log Message: ----------- Fix toolshed error in display_tool if tool is invalid

Fixes the following exception:

``` AttributeError: 'NoneType' object has no attribute 'id' File "galaxy/web/framework/middleware/sentry.py", line 43, in __call__ iterable = self.application(environ, start_response) File "/srv/toolshed/main/venv/local/lib/python2.7/site-packages/paste/translogger.py", line 69, in __call__ return self.application(environ, replacement_start_response) File "/srv/toolshed/main/venv/local/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__ return self.application(environ, start_response) File "routes/middleware.py", line 141, in __call__ response = self.app(environ, start_response) File "/srv/toolshed/main/venv/local/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__ return self.application(environ, start_response) File "galaxy/web/framework/base.py", line 143, in __call__ return self.handle_request(environ, start_response) File "galaxy/web/framework/base.py", line 222, in handle_request body = method(trans, **kwargs) File "galaxy/webapps/tool_shed/controllers/repository.py", line 888, in display_tool tool_state = tool_util.new_state(trans, tool, invalid=False) File "tool_shed/util/tool_util.py", line 211, in new_state log.debug('Failed to build tool state for tool "%s" using standard method, will try to fall back on custom method: %s', tool.id, e) ```

(from https://sentry.galaxyproject.org/sentry/toolshed/issues/279820/).

Might also fix some other issues when redering workflow svg for workflows with invalid tools.

Commit: e89f746a0713df76e1e86eb9507d3336aade9419 https://github.com/galaxyproject/galaxy/commit/e89f746a0713df76e1e86eb9507d3... Author: John Chilton jmchilton@gmail.com Date: 2018-10-29 (Mon, 29 Oct 2018)

Changed paths: M lib/galaxy/webapps/tool_shed/api/tools.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/workflow_util.py

Log Message: ----------- Merge pull request #6932 from mvdbeek/fix_toolshed_bugs

[18.09] Fix toolshed error in display_tool if tool is invalid

Compare: https://github.com/galaxyproject/galaxy/compare/165123863904...e89f746a0713 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.