2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/edc4b7ae61b6/ Changeset: edc4b7ae61b6 User: jmchilton Date: 2015-02-08 20:29:02+00:00 Summary: Add link to actual presentation slides to CONTRIBUTING.md. For people who want to follow along with Dannon at home. Affected #: 1 file diff -r 2c93bedd4898c21ccaa0de413ffedcba91220bb1 -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 CONTRIBUTING.md --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,13 @@ # Contributing This document briefly describes how to contribute to the -galaxy-central core project - also checkout the video of our [2013 -Galaxy Community Conference -presentation](http://vimeo.com/channels/581875/73486255) on the -topic. For information on contributing more broadly to the Galaxy -ecosystem and a deeper discussion of some of these points - please see -the [Develop](https://wiki.galaxyproject.org/Develop/) section of the +galaxy-central core project - also checkout our 2013 Galaxy Community +Conference presentation] on the topic +([video](http://vimeo.com/channels/581875/73486255), +[presentation](https://wiki.galaxyproject.org/Documents/Presentations/GCC2013?action=AttachFile&do=view&target=BakerContribute.pdf)). For +information on contributing more broadly to the Galaxy ecosystem and a +deeper discussion of some of these points - please see the +[Develop](https://wiki.galaxyproject.org/Develop/) section of the [Galaxy Wiki](https://wiki.galaxyproject.org/). ## Before you Begin https://bitbucket.org/galaxy/galaxy-central/commits/7ad7c739fd19/ Changeset: 7ad7c739fd19 User: jmchilton Date: 2015-02-08 20:31:45+00:00 Summary: Merge. Affected #: 3 files diff -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 -r 7ad7c739fd195596fec28531fe55830cf7a3039e lib/galaxy/forms/forms.py --- a/lib/galaxy/forms/forms.py +++ b/lib/galaxy/forms/forms.py @@ -50,7 +50,7 @@ #load fields fields = [] fields_elem = elem.find( 'fields' ) - if fields_elem: + if fields_elem is not None: for field_elem in fields_elem.findall( 'field' ): field_type = field_elem.get( 'type' ) assert field_type in self.field_type_factories, 'Invalid form field type ( %s ).' % field_type diff -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 -r 7ad7c739fd195596fec28531fe55830cf7a3039e lib/galaxy/sample_tracking/external_service_types.py --- a/lib/galaxy/sample_tracking/external_service_types.py +++ b/lib/galaxy/sample_tracking/external_service_types.py @@ -96,9 +96,9 @@ def parse_run_details( self, root ): self.run_details = {} run_details_elem = root.find( 'run_details' ) - if run_details_elem: + if run_details_elem is not None: results_elem = run_details_elem.find( 'results' ) - if results_elem: + if results_elem is not None: # Get the list of resulting datatypes # TODO: the 'results_urls' attribute is only useful if the transfer protocol is http(s), so check if that is the case. self.run_details[ 'results' ], self.run_details[ 'results_urls' ] = self.parse_run_details_results( results_elem ) diff -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 -r 7ad7c739fd195596fec28531fe55830cf7a3039e lib/galaxy/workflow/scheduling_manager.py --- a/lib/galaxy/workflow/scheduling_manager.py +++ b/lib/galaxy/workflow/scheduling_manager.py @@ -31,11 +31,11 @@ self.app = app self.__job_config = app.job_config self.workflow_schedulers = {} - self.active_workflow_schedulers = {} # Passive workflow schedulers - # won't need to be monitored I - # guess. + self.active_workflow_schedulers = {} + # Passive workflow schedulers won't need to be monitored I guess. + self.request_monitor = None - + self.__plugin_classes = self.__plugins_dict() self.__init_schedulers() @@ -67,7 +67,7 @@ try: self.request_monitor.shutdown() except Exception: - log.exception( "Failed to shutdown worklfow request monitor." ) + log.exception( "Failed to shutdown workflow request monitor." ) def queue( self, workflow_invocation, request_params ): workflow_invocation.state = model.WorkflowInvocation.states.NEW @@ -112,8 +112,7 @@ def __init_schedulers_for_element( self, plugins_element ): plugins_kwds = dict( plugins_element.items() ) self.default_scheduler_id = plugins_kwds.get( 'default', DEFAULT_SCHEDULER_ID ) - - for plugin_element in plugins_element.getchildren(): + for plugin_element in plugins_element: plugin_type = plugin_element.tag plugin_kwds = dict( plugin_element.items() ) workflow_scheduler_id = plugin_kwds.get( 'id', None ) @@ -134,7 +133,7 @@ self.workflow_schedulers[ workflow_scheduler_id ] = workflow_scheduler if isinstance( workflow_scheduler, galaxy.workflow.schedulers.ActiveWorkflowSchedulingPlugin ): self.active_workflow_schedulers[ workflow_scheduler_id ] = workflow_scheduler - + def __start_request_monitor( self ): self.request_monitor = WorkflowRequestMonitor( self.app, 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.