From 4df7e45f61f505d94b854c312d970a4a363bc50f Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Wed, 6 Apr 2016 11:09:02 -0400 Subject: [PATCH 1/2] Consolidate duplicated method. --- lib/galaxy/webapps/tool_shed/api/repositories.py | 2 +- lib/galaxy/webapps/tool_shed/model/__init__.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/webapps/tool_shed/api/repositories.py b/lib/galaxy/webapps/tool_shed/api/repositories.py index 2d091cfdef8..ef09f2efe7e 100644 --- a/lib/galaxy/webapps/tool_shed/api/repositories.py +++ b/lib/galaxy/webapps/tool_shed/api/repositories.py @@ -117,7 +117,7 @@ class RepositoriesController( BaseAPIController ): error_message += "invalid parameters received." log.debug( error_message ) return [] - return repository.ordered_installable_revisions( self.app ) + return [ revision[ 1 ] for revision in repository.ordered_installable_revisions( self.app, sort_revisions=True ) ] @web.expose_api_anonymous def get_repository_revision_install_info( self, trans, name, owner, changeset_revision, **kwd ): diff --git a/lib/galaxy/webapps/tool_shed/model/__init__.py b/lib/galaxy/webapps/tool_shed/model/__init__.py index 5675f7a3011..04e909e95cd 100644 --- a/lib/galaxy/webapps/tool_shed/model/__init__.py +++ b/lib/galaxy/webapps/tool_shed/model/__init__.py @@ -250,17 +250,16 @@ class Repository( object, Dictifiable ): return downloadable_revision.metadata.get( 'tool_dependencies', [] ) return [] - def installable_revisions( self, app ): - return suc.get_metadata_revisions( self, hg.repository( ui.ui(), self.repo_path( app ) ), sort_revisions=True ) + def installable_revisions( self, app, sort_revisions=True ): + return suc.get_metadata_revisions( self, + hg.repository( ui.ui(), self.repo_path( app ) ), + sort_revisions=sort_revisions ) def is_new( self, app ): repo = hg.repository( ui.ui(), self.repo_path( app ) ) tip_ctx = repo.changectx( repo.changelog.tip() ) return tip_ctx.rev() < 0 - def ordered_installable_revisions( self, app ): - return [ revision[ 1 ] for revision in suc.get_metadata_revisions( self, hg.repository( ui.ui(), self.repo_path( app ) ), downloadable=True ) ] - def repo_path( self, app ): return app.hgweb_config_manager.get_entry( os.path.join( "repos", self.user.username, self.name ) ) From 4b8b7b46476d0ec9d56b2710759e963938e53bd0 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Thu, 7 Apr 2016 09:31:28 -0400 Subject: [PATCH 2/2] Update which method is used in API. --- lib/galaxy/webapps/tool_shed/api/repositories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/webapps/tool_shed/api/repositories.py b/lib/galaxy/webapps/tool_shed/api/repositories.py index ef09f2efe7e..d09aca9051b 100644 --- a/lib/galaxy/webapps/tool_shed/api/repositories.py +++ b/lib/galaxy/webapps/tool_shed/api/repositories.py @@ -117,7 +117,7 @@ class RepositoriesController( BaseAPIController ): error_message += "invalid parameters received." log.debug( error_message ) return [] - return [ revision[ 1 ] for revision in repository.ordered_installable_revisions( self.app, sort_revisions=True ) ] + return [ revision[ 1 ] for revision in repository.installable_revisions( self.app, sort_revisions=True ) ] @web.expose_api_anonymous def get_repository_revision_install_info( self, trans, name, owner, changeset_revision, **kwd ):