2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0f166ac728f2/ Changeset: 0f166ac728f2 User: guerler Date: 2014-06-19 20:13:49 Summary: Charts: Discrete histogram for jqplot Affected #: 3 files diff -r 5111c44e87f5fb22e6340cdbf3104e6aea83d54c -r 0f166ac728f2c1561e9e491b0e89705130402595 config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/config.js --- /dev/null +++ b/config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/config.js @@ -0,0 +1,24 @@ +define(['plugin/charts/jqplot/common/config'], function(default_config) { + +return $.extend(true, {}, default_config, { + title : 'Discrete Histogram', + category : 'Data processing (requires \'charts\' tool from Toolshed)', + execute : 'histogramdiscrete', + keywords : 'small medium large', + columns : { + x : { + title : 'Observations', + is_label : true + } + }, + settings : { + x_axis_label : { + init : 'Breaks' + }, + y_axis_label : { + init : 'Density' + } + } +}); + +}); \ No newline at end of file diff -r 5111c44e87f5fb22e6340cdbf3104e6aea83d54c -r 0f166ac728f2c1561e9e491b0e89705130402595 config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/logo.png Binary file config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/logo.png has changed diff -r 5111c44e87f5fb22e6340cdbf3104e6aea83d54c -r 0f166ac728f2c1561e9e491b0e89705130402595 config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/wrapper.js --- /dev/null +++ b/config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/wrapper.js @@ -0,0 +1,57 @@ +// dependencies +define(['plugin/charts/jqplot/common/wrapper'], function(Plot) { + +// widget +return Backbone.Model.extend({ + initialize: function(app, options) { + // link request + var request_dictionary = options.request_dictionary; + + // configure request + var index = 1; + var tmp_dict = { + id : request_dictionary.id, + groups : [] + }; + + // configure groups + for (var group_index in request_dictionary.groups) { + var group = request_dictionary.groups[group_index]; + tmp_dict.groups.push({ + key : group.key, + columns : { + x: { + index : 0, + is_label : true + }, + y: { + index : index++ + } + } + }); + } + + // add new request dictionary + options.request_dictionary = tmp_dict; + + // add config maker + options.makeConfig = function(groups, plot_config){ + $.extend(true, plot_config, { + seriesDefaults: { + renderer : $.jqplot.BarRenderer + }, + axes: { + xaxis: { + min : -1 + }, + yaxis: { + pad : 1.2 + } + } + }); + }; + new Plot(app, options); + } +}); + +}); \ No newline at end of file https://bitbucket.org/galaxy/galaxy-central/commits/d64ce44b0d0d/ Changeset: d64ce44b0d0d User: guerler Date: 2014-06-19 20:14:09 Summary: Merge Affected #: 1 file diff -r 0f166ac728f2c1561e9e491b0e89705130402595 -r d64ce44b0d0dc5fcf9978f6047fe78ef946165dc lib/galaxy/jobs/runners/lwr_client/amqp_exchange.py --- a/lib/galaxy/jobs/runners/lwr_client/amqp_exchange.py +++ b/lib/galaxy/jobs/runners/lwr_client/amqp_exchange.py @@ -53,9 +53,13 @@ self.__connect_ssl = connect_ssl self.__exchange = kombu.Exchange(DEFAULT_EXCHANGE_NAME, DEFAULT_EXCHANGE_TYPE) self.__timeout = timeout + # Be sure to log message publishing failures. + if publish_kwds.get("retry", False): + if "retry_policy" not in publish_kwds: + publish_kwds["retry_policy"] = {} + if "errback" not in publish_kwds["retry_policy"]: + publish_kwds["retry_policy"]["errback"] = self.__publish_errback self.__publish_kwds = publish_kwds - if "retry_policy" in self.__publish_kwds: - self.__publish_kwds["retry_policy"]["errback"] = self.__publish_errback @property def url(self): 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.