Connect clean endpoint properly and add -y to exec_clean

lib/galaxy/tools/deps/conda_util.py

@@ -219,7 +219,8 @@ class CondaContext(installable.InstallableContext):
         Clean up after conda installation.
         """
         clean_base_args = [
-            "--tarballs"
+            "--tarballs",
+            "-y"
         ]
         clean_base_args.extend(args)
         return self.exec_command("clean", clean_base_args)

lib/galaxy/tools/deps/resolvers/conda.py

@@ -11,7 +11,6 @@ import galaxy.tools.deps.installable
 from ..conda_util import (
     build_isolated_environment,
     cleanup_failed_install,
-    exec_clean,
     CondaContext,
     CondaTarget,
     install_conda,
@@ -100,7 +99,7 @@ class CondaDependencyResolver(DependencyResolver, ListableDependencyResolver, In
         self.copy_dependencies = copy_dependencies
 
     def clean(self, **kwds):
-        return exec_clean()
+        return self.conda_context.exec_clean()
 
     def resolve(self, name, version, type, **kwds):
         # Check for conda just not being there, this way we can enable

lib/galaxy/tools/deps/views.py

@@ -125,7 +125,6 @@ class DependencyResolversView(object):
         """
         return [index for index, resolver in enumerate(self._dependency_resolvers) if hasattr(resolver, "install_dependency") and not resolver.disabled ]
 
-
     def get_requirements_status(self, requested_requirements, installed_tool_dependencies=None):
         return [self.manager_dependency(installed_tool_dependencies=installed_tool_dependencies, **req) for req in requested_requirements]
 
@@ -140,4 +139,3 @@ class DependencyResolversView(object):
         else:
             [resolver.clean(**kwds) for resolver in self._dependency_resolvers if hasattr(resolver, 'clean')]
             return "OK"
-

lib/galaxy/webapps/galaxy/api/tool_dependencies.py

@@ -167,7 +167,7 @@ class ToolDependenciesAPIController( BaseAPIController ):
     @require_admin
     def clean(self, trans, id=None, **kwds):
         """
-        POST /api/dependencies_resolver/clean
+        POST /api/dependencies_resolver/{index}/clean
 
         Cleans up intermediate files created by resolvers during the dependency
         installation.

lib/galaxy/webapps/galaxy/buildapp.py

@@ -267,10 +267,11 @@ def populate_api_routes( webapp, app ):
     webapp.mapper.connect( '/api/tools/{id:.+?}', action='show', controller="tools" )
     webapp.mapper.resource( 'tool', 'tools', path_prefix='/api' )
 
+    webapp.mapper.connect( '/api/dependency_resolvers/clean', action="clean", controller="tool_dependencies", conditions=dict( method=[ "POST" ]) )
     webapp.mapper.connect( '/api/dependency_resolvers/dependency', action="manager_dependency", controller="tool_dependencies", conditions=dict( method=[ "GET" ] ) )
     webapp.mapper.connect( '/api/dependency_resolvers/dependency', action="install_dependency", controller="tool_dependencies", conditions=dict( method=[ "POST" ] ) )
     webapp.mapper.connect( '/api/dependency_resolvers/requirements', action="manager_requirements", controller="tool_dependencies" )
-    webapp.mapper.connect('/api/dependency_resolvers/clean', action="clean", controller="tool_dependencies", conditions=dict(method=["POST"]))
+    webapp.mapper.connect( '/api/dependency_resolvers/{id}/clean', action="clean", controller="tool_dependencies", conditions=dict( method=[ "POST" ]) )
     webapp.mapper.connect( '/api/dependency_resolvers/{id}/dependency', action="resolver_dependency", controller="tool_dependencies", conditions=dict( method=[ "GET" ] ) )
     webapp.mapper.connect( '/api/dependency_resolvers/{id}/dependency', action="install_dependency", controller="tool_dependencies", conditions=dict( method=[ "POST" ] ) )
     webapp.mapper.connect( '/api/dependency_resolvers/{id}/requirements', action="resolver_requirements", controller="tool_dependencies" )

test/integration/test_resolvers.py

@@ -97,8 +97,8 @@ class CondaResolutionIntegrationTestCase(integration_util.IntegrationTestCase, A
         self._assert_status_code_is( create_response, 200 )
 
     def test_conda_clean( self ):
-        endpoint = 'dependencies_resolvers/clean'
+        endpoint = 'dependency_resolvers/clean'
         create_response = self._post(endpoint, data={}, admin=True)
         self._assert_status_code_is(create_response, 200)
         response = create_response.json()
-        assert response == "OK"
+        assert response == "OK"