Use list comprehension to generate list of all requirements

lib/galaxy/tools/__init__.py

@@ -111,14 +111,9 @@ def __init__( self, config_filenames, tool_root_dir, app ):
         self._view = views.DependencyResolversView(app)
 
     @property
-    def all_tools_requirements(self):
-        reqs = []
-        for desc, tool in self.tools():
-            for requirement in tool.requirements:
-                if requirement.type == 'package':
-                    reqs.append(json.dumps(requirement.to_dict(), sort_keys=True))
-        reqs = [json.loads(req) for req in set(reqs)]
-        return reqs
+    def all_requirements(self):
+        reqs = [json.dumps(req, sort_keys=True) for _, tool in self.tools() for req in tool.tool_requirements]
+        return [json.loads(req) for req in set(reqs)]
 
     @property
     def tools_by_id( self ):

lib/galaxy/webapps/galaxy/api/tools.py

@@ -116,7 +116,7 @@ def all_requirements(self, trans, **kwds):
         Return list of unique requirements for all tools.
         """
 
-        return trans.app.toolbox.all_requirements()
+        return trans.app.toolbox.all_requirements
 
     @expose_api
     @web.require_admin