1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/56e7a8b08234/ Changeset: 56e7a8b08234 User: greg Date: 2013-05-01 02:49:20 Summary: Filter out deleted and deprecated repositories from the new tool shed lists for reviewing repositories with tool, and filter out repositories with missing tool components from the list that shows failing tool tests. Affected #: 1 file diff -r 6dc37563b0b744d8b571b0075110da54fd120df4 -r 56e7a8b0823434bd1458a31da4b35cec8acf88a8 lib/tool_shed/grids/repository_grids.py --- a/lib/tool_shed/grids/repository_grids.py +++ b/lib/tool_shed/grids/repository_grids.py @@ -537,7 +537,9 @@ def build_initial_query( self, trans, **kwd ): # Filter by latest installable revisions that contain tools with missing tool test components. revision_clause_list = [] - for repository in trans.sa_session.query( model.Repository ): + for repository in trans.sa_session.query( model.Repository ) \ + .filter( and_( model.Repository.table.c.deprecated == False, + model.Repository.table.c.deleted == False ) ): changeset_revision = filter_by_latest_downloadable_changeset_revision_that_has_missing_tool_test_components( trans, repository ) if changeset_revision: revision_clause_list.append( model.RepositoryMetadata.table.c.changeset_revision == changeset_revision ) @@ -614,7 +616,9 @@ def build_initial_query( self, trans, **kwd ): # Filter by latest installable revisions that contain tools with at least 1 failing tool test. revision_clause_list = [] - for repository in trans.sa_session.query( model.Repository ): + for repository in trans.sa_session.query( model.Repository ) \ + .filter( and_( model.Repository.table.c.deprecated == False, + model.Repository.table.c.deleted == False ) ): changeset_revision = filter_by_latest_downloadable_changeset_revision_that_has_failing_tool_tests( trans, repository ) if changeset_revision: revision_clause_list.append( model.RepositoryMetadata.table.c.changeset_revision == changeset_revision ) @@ -692,7 +696,9 @@ # We have the list of repositories that the current user is authorized to update, so filter further by latest installable revisions that contain # tools with at least 1 failing tool test. revision_clause_list = [] - for repository in trans.sa_session.query( model.Repository ): + for repository in trans.sa_session.query( model.Repository ) \ + .filter( and_( model.Repository.table.c.deprecated == False, + model.Repository.table.c.deleted == False ) ): changeset_revision = filter_by_latest_downloadable_changeset_revision_that_has_no_failing_tool_tests( trans, repository ) if changeset_revision: revision_clause_list.append( model.RepositoryMetadata.table.c.changeset_revision == changeset_revision ) @@ -1345,7 +1351,7 @@ repo = hg.repository( suc.get_configured_ui(), repository.repo_path( trans.app ) ) tip_ctx = str( repo.changectx( repo.changelog.tip() ) ) repository_metadata = get_latest_installable_repository_metadata_if_it_includes_tools( trans, repository ) - if repository_metadata and not repository_metadata.tools_functionally_correct: + if repository_metadata and not repository_metadata.missing_test_components and not repository_metadata.tools_functionally_correct: return repository_metadata.changeset_revision return None Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.