2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/36028c9bc709/ changeset: 36028c9bc709 user: inithello date: 2013-02-28 16:33:22 summary: Added filter for malicious to repository_revisions API controller. affected #: 1 file diff -r f4273b52a432089be730b8fb62d6fd63f89249f1 -r 36028c9bc7096507f3b30f9e3b7789a566f288f5 lib/galaxy/webapps/tool_shed/api/repository_revisions.py --- a/lib/galaxy/webapps/tool_shed/api/repository_revisions.py +++ b/lib/galaxy/webapps/tool_shed/api/repository_revisions.py @@ -35,6 +35,10 @@ downloadable = kwd.get( 'downloadable', None ) if downloadable is not None: clause_list.append( trans.model.RepositoryMetadata.table.c.downloadable == util.string_as_bool( downloadable ) ) + # Filter by malicious if received. + malicious = kwd.get( 'malicious', None ) + if malicious is not None: + clause_list.append( trans.model.RepositoryMetadata.table.c.malicious == util.string_as_bool( malicious ) ) # Filter by tools_functionally_correct if received. tools_functionally_correct = kwd.get( 'tools_functionally_correct', None ) if tools_functionally_correct is not None: https://bitbucket.org/galaxy/galaxy-central/commits/c494556d21a8/ changeset: c494556d21a8 user: inithello date: 2013-02-28 16:33:59 summary: Add malicious and deleted filters to repository listing. affected #: 1 file diff -r 36028c9bc7096507f3b30f9e3b7789a566f288f5 -r c494556d21a8c6bde808fccb8d584e8bb9f73662 test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -151,7 +151,7 @@ listing = file( location, 'r' ).read() elif source == 'url': assert tool_shed_api_key is not None, 'Cannot proceed without tool shed API key.' - params = urllib.urlencode( dict( deprecated='false', deleted='false', downloadable='true', tools_functionally_correct='false', do_not_test='false' ) ) + params = urllib.urlencode( dict( tools_functionally_correct='false', do_not_test='false', downloadable='true', malicious='false' ) ) api_url = get_api_url( base=location, parts=[ 'repository_revisions' ], params=params ) if format == 'json': return json_from_url( api_url ) @@ -370,6 +370,9 @@ metadata_revision_id = repository_dict[ 'id' ] repository_dict[ 'tool_shed_url' ] = galaxy_tool_shed_url repository_info = get_repository_info_from_api( galaxy_tool_shed_url, repository_dict ) + # If a repository is deleted or malicious, we don't need to test it. + if repository_info[ 'deleted' ] or repository_info[ 'deprecated' ]: + continue repository_dict = dict( repository_info.items() + repository_dict.items() ) # Generate the method that will install this repository into the running Galaxy instance. test_install_repositories.generate_install_method( repository_dict ) 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.