2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/cb12b9845177/ Changeset: cb12b9845177 User: jgoecks Date: 2013-03-28 23:44:41 Summary: Fix import *s in genome data providers. Affected #: 1 file diff -r 92c8a55a6679aeae14431202a04affb7b4f9b701 -r cb12b9845177ba3bf1d9918d2b4df1e30e27cb65 lib/galaxy/visualization/data_providers/genome.py --- a/lib/galaxy/visualization/data_providers/genome.py +++ b/lib/galaxy/visualization/data_providers/genome.py @@ -11,12 +11,12 @@ pkg_resources.require( "pysam" ) pkg_resources.require( "numpy" ) import numpy -from galaxy.datatypes.util.gff_util import * +from galaxy.datatypes.util.gff_util import GFFReaderWrapper, GFFInterval, GFFFeature, convert_gff_coords_to_bed from galaxy.util.json import from_json_string from bx.interval_index_file import Indexes from bx.bbi.bigwig_file import BigWigFile from galaxy.util.lrucache import LRUCache -from galaxy.visualization.tracks.summary import * +from galaxy.visualization.tracks.summary import summary_tree_from_file from galaxy.visualization.data_providers.basic import BaseDataProvider import galaxy_utils.sequence.vcf from galaxy.datatypes.tabular import Tabular, Vcf https://bitbucket.org/galaxy/galaxy-central/commits/e6283946c9a3/ Changeset: e6283946c9a3 User: jgoecks Date: 2013-03-28 23:45:12 Summary: Automated merge. Affected #: 1 file diff -r cb12b9845177ba3bf1d9918d2b4df1e30e27cb65 -r e6283946c9a3cf18f89115c0df291ddd26a0a567 lib/galaxy/webapps/galaxy/controllers/library_common.py --- a/lib/galaxy/webapps/galaxy/controllers/library_common.py +++ b/lib/galaxy/webapps/galaxy/controllers/library_common.py @@ -94,7 +94,7 @@ return rval @web.expose - def browse_library( self, trans, cntrller, **kwd ): + def browse_library( self, trans, cntrller='library', **kwd ): params = util.Params( kwd ) message = util.restore_text( params.get( 'message', '' ) ) status = params.get( 'status', 'done' ) 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.